summaryrefslogtreecommitdiff
path: root/indra/newview/app_settings/settings.xml
diff options
context:
space:
mode:
Diffstat (limited to 'indra/newview/app_settings/settings.xml')
-rwxr-xr-xindra/newview/app_settings/settings.xml35
1 files changed, 23 insertions, 12 deletions
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index 94d3c8a59f..4a106c08e4 100755
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -4654,17 +4654,6 @@
<key>Value</key>
<integer>0</integer>
</map>
- <key>InventoryDisplayOutbox</key>
- <map>
- <key>Comment</key>
- <string>Override merchant inventory outbox display</string>
- <key>Persist</key>
- <integer>0</integer>
- <key>Type</key>
- <string>Boolean</string>
- <key>Value</key>
- <integer>0</integer>
- </map>
<key>InventoryInboxToggleState</key>
<map>
<key>Comment</key>
@@ -4687,6 +4676,17 @@
<key>Value</key>
<integer>0</integer>
</map>
+ <key>InventoryOutboxDisplayBoth</key>
+ <map>
+ <key>Comment</key>
+ <string>Show the legacy Merchant Outbox UI as well as the Marketplace Listings UI</string>
+ <key>Persist</key>
+ <integer>1</integer>
+ <key>Type</key>
+ <string>Boolean</string>
+ <key>Value</key>
+ <integer>0</integer>
+ </map>
<key>InventoryOutboxLogging</key>
<map>
<key>Comment</key>
@@ -4718,7 +4718,7 @@
<key>Type</key>
<string>U32</string>
<key>Value</key>
- <integer>21</integer>
+ <integer>20</integer>
</map>
<key>InventoryOutboxMaxFolderDepth</key>
<map>
@@ -5601,6 +5601,17 @@
<key>Value</key>
<string />
</map>
+ <key>MarketplaceListingsLogging</key>
+ <map>
+ <key>Comment</key>
+ <string>Enable debug output associated with the Marketplace Listings (SLM) API.</string>
+ <key>Persist</key>
+ <integer>1</integer>
+ <key>Type</key>
+ <string>Boolean</string>
+ <key>Value</key>
+ <integer>0</integer>
+ </map>
<key>MarketplaceURL</key>
<map>
<key>Comment</key>