summaryrefslogtreecommitdiff
path: root/indra/newview/app_settings/settings.xml
diff options
context:
space:
mode:
authorsimon <none@none>2014-04-21 12:36:35 -0700
committersimon <none@none>2014-04-21 12:36:35 -0700
commit0b9a777bfd3c85390c55d91fc3dc5c4bee9bf71b (patch)
treedd3f484813df4f1a74a525f3f6dddcbc91beac7c /indra/newview/app_settings/settings.xml
parente606b7918dc6dbe2a4048f4bbd8590bfc3eca90e (diff)
parentc71e459bed68c1602d409e5c946c5e016d09d105 (diff)
Merge downstream code updating version to 3.7.7
Diffstat (limited to 'indra/newview/app_settings/settings.xml')
-rwxr-xr-xindra/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 2a01b81943..8cea4a398e 100755
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -4655,6 +4655,17 @@
<key>Value</key>
<integer>0</integer>
</map>
+ <key>InventoryOutboxMakeVisible</key>
+ <map>
+ <key>Comment</key>
+ <string>Enable making the Merchant Outbox and Inbox visible in the inventory for debug purposes.</string>
+ <key>Persist</key>
+ <integer>1</integer>
+ <key>Type</key>
+ <string>Boolean</string>
+ <key>Value</key>
+ <integer>0</integer>
+ </map>
<key>InventoryOutboxMaxFolderCount</key>
<map>
<key>Comment</key>