summaryrefslogtreecommitdiff
path: root/indra/newview/app_settings/settings.xml
diff options
context:
space:
mode:
authorMerov Linden <merov@lindenlab.com>2014-04-22 13:32:15 -0700
committerMerov Linden <merov@lindenlab.com>2014-04-22 13:32:15 -0700
commitf6bb6a0f935323434a3f3d0d94e94c8d8238effe (patch)
tree81945284f515f25ce23284077b1e07f500ad64ff /indra/newview/app_settings/settings.xml
parentc79abac5ad5d41f86655883fd9f3ec6a108967a7 (diff)
parentc71e459bed68c1602d409e5c946c5e016d09d105 (diff)
Pull merge from lindenlab/viewer-release
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 dfb917fab7..0c4d8d8b9c 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>