summaryrefslogtreecommitdiff
path: root/indra/newview/llscenemonitor.cpp
diff options
context:
space:
mode:
authorRichard Linden <none@none>2013-11-13 16:18:59 -0800
committerRichard Linden <none@none>2013-11-13 16:18:59 -0800
commit5be20dd02415462991b26fb1aadf595a129661de (patch)
treeb47b2c8755c6aedc5184cbe89b7412ef0006b2a9 /indra/newview/llscenemonitor.cpp
parent0eba8e8f23ecbdbfcb9a409dd91a1e2a6c4d3f00 (diff)
moved SceneLoadingMonitor settings vars (and renamed SceneLoadingPixelDiffThreshold to SceneLoadingMonitorPixelDiffThreshold)
tweaked layout of floater_model_preview.xml
Diffstat (limited to 'indra/newview/llscenemonitor.cpp')
-rw-r--r--indra/newview/llscenemonitor.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llscenemonitor.cpp b/indra/newview/llscenemonitor.cpp
index 44ab35420b..77f53616cd 100644
--- a/indra/newview/llscenemonitor.cpp
+++ b/indra/newview/llscenemonitor.cpp
@@ -498,7 +498,7 @@ void LLSceneMonitor::fetchQueryResult()
LL_DEBUGS("SceneMonitor") << "Frame difference: " << mDiffResult << LL_ENDL;
record(sFramePixelDiff, mDiffResult);
- static LLCachedControl<F32> diff_threshold(gSavedSettings,"SceneLoadingPixelDiffThreshold");
+ static LLCachedControl<F32> diff_threshold(gSavedSettings,"SceneLoadingMonitorPixelDiffThreshold");
F32Seconds elapsed_time = mRecordingTimer.getElapsedTimeF32();
if (elapsed_time > scene_load_sample_time)