diff options
| author | Richard Linden <none@none> | 2013-11-13 16:19:05 -0800 |
|---|---|---|
| committer | Richard Linden <none@none> | 2013-11-13 16:19:05 -0800 |
| commit | 6d9d382c73c026f1dcb2f9d2810994a66cd2bd9d (patch) | |
| tree | 758844dd008d9de2a4a8e261cbf365304ea9f67f /indra/newview/app_settings | |
| parent | 754a671c93f55c3e1cde6cd2ee0771156f7abaf5 (diff) | |
| parent | 5be20dd02415462991b26fb1aadf595a129661de (diff) | |
Automated merge with http://bitbucket.org/lindenlab/viewer-interesting
Diffstat (limited to 'indra/newview/app_settings')
| -rwxr-xr-x | indra/newview/app_settings/settings.xml | 70 |
1 files changed, 35 insertions, 35 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> |