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.xml57
1 files changed, 45 insertions, 12 deletions
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index 9d9bc43bd7..b4eb60c6a3 100755
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -4680,17 +4680,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>
@@ -4713,6 +4702,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>
@@ -4744,7 +4744,7 @@
<key>Type</key>
<string>U32</string>
<key>Value</key>
- <integer>21</integer>
+ <integer>20</integer>
</map>
<key>InventoryOutboxMaxFolderDepth</key>
<map>
@@ -4768,6 +4768,17 @@
<key>Value</key>
<integer>200</integer>
</map>
+ <key>InventoryOutboxMaxStockItemCount</key>
+ <map>
+ <key>Comment</key>
+ <string>Maximum number of items allowed in a stock folder.</string>
+ <key>Persist</key>
+ <integer>0</integer>
+ <key>Type</key>
+ <string>U32</string>
+ <key>Value</key>
+ <integer>200</integer>
+ </map>
<key>InventorySortOrder</key>
<map>
<key>Comment</key>
@@ -4779,6 +4790,17 @@
<key>Value</key>
<integer>7</integer>
</map>
+ <key>MarketplaceListingsSortOrder</key>
+ <map>
+ <key>Comment</key>
+ <string>Specifies sort for marketplace listings</string>
+ <key>Persist</key>
+ <integer>1</integer>
+ <key>Type</key>
+ <string>U32</string>
+ <key>Value</key>
+ <integer>2</integer>
+ </map>
<key>InvertMouse</key>
<map>
<key>Comment</key>
@@ -5628,6 +5650,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>