summaryrefslogtreecommitdiff
path: root/indra/newview/app_settings
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2011-06-15 11:58:50 -0400
committerOz Linden <oz@lindenlab.com>2011-06-15 11:58:50 -0400
commit624b050589b470951fc945c3b2cff11a4912150d (patch)
treee223a0b7f5d3edd95b3ffe1dccf09b6e200bb7c3 /indra/newview/app_settings
parent26e1f92c831c35ca0761c385d0540331d26f9a50 (diff)
parentc3e4fd975cd6ce7af9521143d469ec9f017d47dd (diff)
merge changes for storm-1103
Diffstat (limited to 'indra/newview/app_settings')
-rw-r--r--indra/newview/app_settings/settings.xml11
1 files changed, 11 insertions, 0 deletions
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index a395fe3606..ac6ea0f860 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -9648,6 +9648,17 @@
<key>Value</key>
<integer>1</integer>
</map>
+ <key>NearbyListShowMap</key>
+ <map>
+ <key>Comment</key>
+ <string>Show/hide map above nearby people list</string>
+ <key>Persist</key>
+ <integer>1</integer>
+ <key>Type</key>
+ <string>Boolean</string>
+ <key>Value</key>
+ <integer>1</integer>
+ </map>
<key>NearbyListShowIcons</key>
<map>
<key>Comment</key>