summaryrefslogtreecommitdiff
path: root/indra/newview/app_settings/settings.xml
diff options
context:
space:
mode:
authorMerov Linden <merov@lindenlab.com>2014-03-04 14:28:34 -0800
committerMerov Linden <merov@lindenlab.com>2014-03-04 14:28:34 -0800
commitc7e2f81bbf299cf884d9e687fc4a7e7f7096c877 (patch)
tree1436dbf2dfac1deecee4a2ded9a891b7bf68bfb5 /indra/newview/app_settings/settings.xml
parentde8fea13627cc5978b8a6135802a52864a11c39a (diff)
parentd2b604c61181a03bb16f2b951b6f86c582860759 (diff)
Pull merge from viewer-maint-2287 aka Merchant Outbox
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 4c7b192ae5..e6bcb04cb9 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>