summaryrefslogtreecommitdiff
path: root/indra/newview/app_settings
diff options
context:
space:
mode:
authorSteven Bennetts <steve@lindenlab.com>2009-10-09 00:42:36 +0000
committerSteven Bennetts <steve@lindenlab.com>2009-10-09 00:42:36 +0000
commit81e0fb43caa27491fa18b17d6a05cafb0e20dfa6 (patch)
treeaea6b59f47a56255ab01c0b814650b943170847e /indra/newview/app_settings
parent4c89e7389383e2943334ad8ec185b8935cbe7db8 (diff)
merge https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0@1943 https://svn.aws.productengine.com/secondlife/pe/stable-2@1958 -> viewer-2.0.0-3
* Bugs: EXT-1148 EXT-1330 EXT-990 EXT-1259 EXT-1184 EXT-1327 EXT-1389 EXT-1276 EXT-1390 EXT-1396 EXT-1050 EXT-1094 EXT-1166 EXT-1137 EXT-1327 EXT-782 EXT-1137 EXT-1394 EXT-1326 EXT-917 EXT-1262 * New Dev: EXT-1292 EXT-1139
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 806f96a654..be48ebdf67 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -7610,6 +7610,17 @@
<key>Value</key>
<integer>1</integer>
</map>
+ <key>ShowSnapshotButton</key>
+ <map>
+ <key>Comment</key>
+ <string>Show/Hide Snapshot button button in the bottom tray</string>
+ <key>Persist</key>
+ <integer>1</integer>
+ <key>Type</key>
+ <string>Boolean</string>
+ <key>Value</key>
+ <integer>1</integer>
+ </map>
<key>ShowMoveButton</key>
<map>
<key>Comment</key>