diff options
| author | Oz Linden <oz@lindenlab.com> | 2014-04-21 16:21:31 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2014-04-21 16:21:31 -0400 |
| commit | b1a7137ba6e56e1b692205f129d86acc942209e9 (patch) | |
| tree | 595b9e3a2b9e4be799459e06c9b33793013d0ae0 /indra/newview/app_settings/settings.xml | |
| parent | 32bbb07f0a727b5aa318ba3c32764ec29cc96956 (diff) | |
| parent | c71e459bed68c1602d409e5c946c5e016d09d105 (diff) | |
merge changes for 3.7.6-release
Diffstat (limited to 'indra/newview/app_settings/settings.xml')
| -rwxr-xr-x | indra/newview/app_settings/settings.xml | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index 2567b78575..778ab4983a 100755 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -4644,6 +4644,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> |