summaryrefslogtreecommitdiff
path: root/indra/newview/app_settings/settings.xml
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2013-02-12 13:27:03 -0500
committerOz Linden <oz@lindenlab.com>2013-02-12 13:27:03 -0500
commit8bb3d0891dfd87b54cd45dfe199c2f1bf21205b3 (patch)
tree30f038fde12f74908f94be9079cdee759481c5a0 /indra/newview/app_settings/settings.xml
parent66c75202a8a99adeb7de443ce5ebe3d834f91c24 (diff)
parente87000ba0750e55d9d6b55feccc4124f5d2b4b74 (diff)
merge up to 3.4.5-release
Diffstat (limited to 'indra/newview/app_settings/settings.xml')
-rw-r--r--[-rwxr-xr-x]indra/newview/app_settings/settings.xml14
1 files changed, 13 insertions, 1 deletions
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index 258370d6f3..e80505740f 100755..100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -5168,7 +5168,7 @@
<key>Comment</key>
<string>Center the focal point of the minimap.</string>
<key>Persist</key>
- <integer>0</integer>
+ <integer>1</integer>
<key>Type</key>
<string>Boolean</string>
<key>Value</key>
@@ -14070,6 +14070,18 @@
<real>1.0</real>
</array>
</map>
+
+ <key>HideUIControls</key>
+ <map>
+ <key>Comment</key>
+ <string>Hide all menu items and buttons</string>
+ <key>Persist</key>
+ <integer>0</integer>
+ <key>Type</key>
+ <string>Boolean</string>
+ <key>Value</key>
+ <integer>0</integer>
+ </map>
<key>SimulateFBOFailure</key>
<map>