summaryrefslogtreecommitdiff
path: root/indra/newview/app_settings
diff options
context:
space:
mode:
authorLeyla Farazha <leyla@lindenlab.com>2010-06-04 13:23:12 -0700
committerLeyla Farazha <leyla@lindenlab.com>2010-06-04 13:23:12 -0700
commitb1b4e56bcec6718a971f01d51ffe4363e8fba9ac (patch)
tree82b763d1ed3782fe9ec3f6f0c5f17f2bc0abf7a3 /indra/newview/app_settings
parentc393383f4463f40e4574968c0b440c51022be7b9 (diff)
parent6d840687a5306f9234444ed1bde1f6b877da3996 (diff)
Merge
Diffstat (limited to 'indra/newview/app_settings')
-rw-r--r--indra/newview/app_settings/settings.xml13
1 files changed, 12 insertions, 1 deletions
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index 6204c8047a..70caead451 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -583,7 +583,7 @@
<key>Type</key>
<string>U32</string>
<key>Value</key>
- <integer>0</integer>
+ <integer>180</integer>
</map>
<key>AvatarSex</key>
<map>
@@ -8360,6 +8360,17 @@
<key>Value</key>
<integer>0</integer>
</map>
+ <key>ShowMiniLocationPanel</key>
+ <map>
+ <key>Comment</key>
+ <string>Show/Hide Mini-Location Panel</string>
+ <key>Persist</key>
+ <integer>1</integer>
+ <key>Type</key>
+ <string>Boolean</string>
+ <key>Value</key>
+ <integer>0</integer>
+ </map>
<key>SidebarCameraMovement</key>
<map>
<key>Comment</key>