summaryrefslogtreecommitdiff
path: root/indra/newview/app_settings
diff options
context:
space:
mode:
authorTofu Linden <tofu.linden@lindenlab.com>2010-06-02 20:17:25 +0100
committerTofu Linden <tofu.linden@lindenlab.com>2010-06-02 20:17:25 +0100
commite57ae451744f08c1c614ef6903918ba4be6d4674 (patch)
tree00608932937c6b75f9b2cdc72d151005425f95a5 /indra/newview/app_settings
parent6b45a32ac56b95f3e70ba4948819d470f3574cea (diff)
parent142a6c3b8fa9e286c0336236d1eccd9a6725f06a (diff)
merge from PE's viewer-trunk
Diffstat (limited to 'indra/newview/app_settings')
-rw-r--r--indra/newview/app_settings/settings.xml33
1 files changed, 11 insertions, 22 deletions
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index 83b057ff5f..6204c8047a 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -8305,17 +8305,6 @@
<key>Value</key>
<integer>0</integer>
</map>
- <key>ShowSidebarButton</key>
- <map>
- <key>Comment</key>
- <string>Shows/hides Sidebar button in the bottom tray.</string>
- <key>Persist</key>
- <integer>1</integer>
- <key>Type</key>
- <string>Boolean</string>
- <key>Value</key>
- <integer>0</integer>
- </map>
<key>ShowSnapshotButton</key>
<map>
<key>Comment</key>
@@ -8858,17 +8847,6 @@
<key>Value</key>
<integer>0</integer>
</map>
- <key>SidebarWithButtonsVisibility</key>
- <map>
- <key>Comment</key>
- <string>Sets visibility of sidebar with its tabs' buttons</string>
- <key>Persist</key>
- <integer>1</integer>
- <key>Type</key>
- <string>Boolean</string>
- <key>Value</key>
- <integer>1</integer>
- </map>
<key>SkinCurrent</key>
<map>
<key>Comment</key>
@@ -11395,5 +11373,16 @@
<string>mini_map</string>
</array>
</map>
+ <key>LandmarksSortedByDate</key>
+ <map>
+ <key>Comment</key>
+ <string>Reflects landmarks panel sorting order.</string>
+ <key>Persist</key>
+ <integer>1</integer>
+ <key>Type</key>
+ <string>Boolean</string>
+ <key>Value</key>
+ <integer>1</integer>
+ </map>
</map>
</llsd>