summaryrefslogtreecommitdiffstats
path: root/o3d
diff options
context:
space:
mode:
authorvangelis@google.com <vangelis@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-07-03 00:23:10 +0000
committervangelis@google.com <vangelis@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-07-03 00:23:10 +0000
commitc7b0bc7ad6c34536945624545b507fd2b6ca95e3 (patch)
treebcb9260a59ec6e69c6115ee7a234a68c5a201b57 /o3d
parent03d21c01b5127feb09a2e95150c9258d84f3be40 (diff)
downloadchromium_src-c7b0bc7ad6c34536945624545b507fd2b6ca95e3.zip
chromium_src-c7b0bc7ad6c34536945624545b507fd2b6ca95e3.tar.gz
chromium_src-c7b0bc7ad6c34536945624545b507fd2b6ca95e3.tar.bz2
Turning async loading off to get the beachdemo to work again in IE. This is logged as issue #82. Once it's fixed, we should turn async loading back on.
Review URL: http://codereview.chromium.org/155028 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@19864 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'o3d')
-rw-r--r--o3d/samples/beachdemo/beachdemo.js4
1 files changed, 2 insertions, 2 deletions
diff --git a/o3d/samples/beachdemo/beachdemo.js b/o3d/samples/beachdemo/beachdemo.js
index e7d2dae..4b99bd9 100644
--- a/o3d/samples/beachdemo/beachdemo.js
+++ b/o3d/samples/beachdemo/beachdemo.js
@@ -1431,7 +1431,7 @@ function loadProxy() {
try {
var url = o3djs.util.getAbsoluteURI('assets/beach-low-poly.o3dtgz');
g_loadInfo = o3djs.scene.loadScene(g_client, g_proxyPack, g_proxyRoot,
- url, callback, {opt_async: true});
+ url, callback, {opt_async: false});
} catch (e) {
showError(e);
}
@@ -1570,7 +1570,7 @@ function loadMainScene() {
var url = o3djs.util.getAbsoluteURI('assets/beachdemo.o3dtgz');
g_particleLoader.loadScene(
- g_client, g_scenePack, g_sceneRoot, url, callback, {opt_async: true});
+ g_client, g_scenePack, g_sceneRoot, url, callback, {opt_async: false});
g_particleLoader.finish()
g_loader.finish();
} catch (e) {