summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRichard Linden <none@none>2013-08-27 19:32:26 -0700
committerRichard Linden <none@none>2013-08-27 19:32:26 -0700
commitbf99887cbb8d69b5f29d18566ad082d2d0109e9c (patch)
treef99c7d607986d9b4a4d2a1bd3759dbe05d9e0b39
parent5ddd5694b54150b50a77627112ea98a4a94d0e46 (diff)
SH-4453 FIX: Interesting: SceneLoadingMonitorEnabled does not work until the camera turns
set enabled flag before calling freeze scene
-rw-r--r--indra/newview/llscenemonitor.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/newview/llscenemonitor.cpp b/indra/newview/llscenemonitor.cpp
index 57d58a9d4e..ecffc67993 100644
--- a/indra/newview/llscenemonitor.cpp
+++ b/indra/newview/llscenemonitor.cpp
@@ -274,17 +274,17 @@ void LLSceneMonitor::capture()
if(mEnabled != enabled)
{
if(mEnabled)
- {
+ {
+ mEnabled = enabled;
unfreezeScene();
reset();
force_capture = true;
}
else
{
+ mEnabled = enabled;
freezeScene();
}
-
- mEnabled = enabled;
}
if (mEnabled