Automated merge with http://bitbucket.org/lindenlab/viewer-interesting

3 files changed, 40 insertions, 40 deletions

diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index 789a504c39..6a84c4fca0 100755
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -6440,7 +6440,7 @@
     <map>
       <key>Comment</key>
       <string>Search radius for nearby avatars</string>
-      <key>Persist</key>
+      <key>Persist</key>	
       <integer>1</integer>
       <key>Type</key>
       <string>F32</string>
@@ -10231,39 +10231,6 @@
       <key>Value</key>
       <real>100.0</real>
     </map>
-    <key>SceneLoadingMonitorEnabled</key>
-    <map>
-      <key>Comment</key>
-      <string>Enabled scene loading monitor if set</string>
-      <key>Persist</key>
-      <integer>0</integer>
-      <key>Type</key>
-      <string>Boolean</string>
-      <key>Value</key>
-      <integer>0</integer>
-    </map>
-    <key>SceneLoadingMonitorSampleTime</key>
-    <map>
-      <key>Comment</key>
-      <string>Time between screen samples when monitor scene load (seconds)</string>
-      <key>Persist</key>
-      <integer>1</integer>
-      <key>Type</key>
-      <string>F32</string>
-      <key>Value</key>
-      <real>0.25</real>
-    </map>
-    <key>SceneLoadingPixelDiffThreshold</key>
-    <map>
-      <key>Comment</key>
-      <string>Amount of pixels changed required to consider the scene as still loading (square root of fraction of pixels on screen)</string>
-      <key>Persist</key>
-      <integer>1</integer>
-      <key>Type</key>
-      <string>F32</string>
-      <key>Value</key>
-      <real>0.02</real>
-    </map>
     <key>SceneLoadMinRadius</key>
     <map>
       <key>Comment</key>
@@ -10297,7 +10264,40 @@
       <key>Value</key>
       <real>200.0</real>
     </map>
-    <key>ScriptHelpFollowsCursor</key>
+	<key>SceneLoadingMonitorEnabled</key>
+	<map>
+		<key>Comment</key>
+		<string>Enabled scene loading monitor if set</string>
+		<key>Persist</key>
+		<integer>0</integer>
+		<key>Type</key>
+		<string>Boolean</string>
+		<key>Value</key>
+		<integer>0</integer>
+	</map>
+	<key>SceneLoadingMonitorSampleTime</key>
+	<map>
+		<key>Comment</key>
+		<string>Time between screen samples when monitor scene load (seconds)</string>
+		<key>Persist</key>
+		<integer>1</integer>
+		<key>Type</key>
+		<string>F32</string>
+		<key>Value</key>
+		<real>0.25</real>
+	</map>
+	<key>SceneLoadingMonitorPixelDiffThreshold</key>
+	<map>
+		<key>Comment</key>
+		<string>Amount of pixels changed required to consider the scene as still loading (square root of fraction of pixels on screen)</string>
+		<key>Persist</key>
+		<integer>1</integer>
+		<key>Type</key>
+		<string>F32</string>
+		<key>Value</key>
+		<real>0.02</real>
+	</map>
+	<key>ScriptHelpFollowsCursor</key>
     <map>
       <key>Comment</key>
       <string>Scripting help window updates contents based on script editor contents under text cursor</string>
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)
diff --git a/indra/newview/skins/default/xui/en/floater_model_preview.xml b/indra/newview/skins/default/xui/en/floater_model_preview.xml
index 5e92a12251..558f9a319f 100755
--- a/indra/newview/skins/default/xui/en/floater_model_preview.xml
+++ b/indra/newview/skins/default/xui/en/floater_model_preview.xml
@@ -212,7 +212,7 @@
              follows="top|left"
              height="20"
              layout="topleft"
-             left="215"
+             left="225"
              name="lod_mode_high"
              top_delta="0"
              visible="false"
@@ -342,7 +342,7 @@
              follows="top|left"
              height="20"
              layout="topleft"
-             left="215"
+             left="225"
              name="lod_mode_medium"
              top_delta="0"
              width="135">
@@ -470,7 +470,7 @@
              follows="top|left"
              height="20"
              layout="topleft"
-             left="215"
+             left="225"
              name="lod_mode_low"
              top_delta="0"
              width="135">
@@ -598,7 +598,7 @@
              follows="top|left"
              height="20"
              layout="topleft"
-             left="215"
+             left="225"
              name="lod_mode_lowest"
              top_delta="0"
              width="135">