summaryrefslogtreecommitdiff
path: root/indra/newview/app_settings/settings.xml
diff options
context:
space:
mode:
Diffstat (limited to 'indra/newview/app_settings/settings.xml')
-rwxr-xr-xindra/newview/app_settings/settings.xml37
1 files changed, 24 insertions, 13 deletions
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index 138bdde9e9..2eb780ec5d 100755
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -49,6 +49,17 @@
<key>Value</key>
<real>300</real>
</map>
+ <key>AckCollectTime</key>
+ <map>
+ <key>Comment</key>
+ <string>Ack messages collection and grouping time</string>
+ <key>Persist</key>
+ <integer>1</integer>
+ <key>Type</key>
+ <string>F32</string>
+ <key>Value</key>
+ <real>0.1</real>
+ </map>
<key>AdminMenu</key>
<map>
<key>Comment</key>
@@ -5019,6 +5030,7 @@
<key>Type</key>
<string>LLSD</string>
<key>Value</key>
+ <array />
</map>
<key>LSLFindCaseInsensitivity</key>
<map>
@@ -11774,7 +11786,7 @@
<key>Type</key>
<string>F32</string>
<key>Value</key>
- <integer>0.0</integer>
+ <real>0.0</real>
</map>
<key>TextureFetchSource</key>
<map>
@@ -13217,6 +13229,17 @@
<key>Value</key>
<integer>1</integer>
</map>
+ <key>EnvironmentPersistAcrossLogin</key>
+ <map>
+ <key>Comment</key>
+ <string>Keep Environment settings consistent across sessions</string>
+ <key>Persist</key>
+ <integer>1</integer>
+ <key>Type</key>
+ <string>Boolean</string>
+ <key>Value</key>
+ <integer>0</integer>
+ </map>
<key>UseDayCycle</key>
<map>
<key>Comment</key>
@@ -14108,17 +14131,6 @@
<key>Value</key>
<integer>-1</integer>
</map>
- <key>MaxFPS</key>
- <map>
- <key>Comment</key>
- <string>Yield some time to the local host if we reach a threshold framerate.</string>
- <key>Persist</key>
- <integer>1</integer>
- <key>Type</key>
- <string>F32</string>
- <key>Value</key>
- <real>-1.0</real>
- </map>
<key>ForcePeriodicRenderingTime</key>
<map>
<key>Comment</key>
@@ -15610,7 +15622,6 @@
<key>Value</key>
<integer>0</integer>
</map>
-
</map>
</llsd>