summaryrefslogtreecommitdiff
path: root/indra/newview/app_settings
diff options
context:
space:
mode:
Diffstat (limited to 'indra/newview/app_settings')
-rwxr-xr-xindra/newview/app_settings/commands.xml10
-rwxr-xr-xindra/newview/app_settings/settings.xml15
2 files changed, 23 insertions, 2 deletions
diff --git a/indra/newview/app_settings/commands.xml b/indra/newview/app_settings/commands.xml
index 7b329e2092..87ac7cce2c 100755
--- a/indra/newview/app_settings/commands.xml
+++ b/indra/newview/app_settings/commands.xml
@@ -118,6 +118,16 @@
tooltip_ref="Command_Marketplace_Tooltip"
execute_function="Avatar.OpenMarketplace"
/>
+ <command name="marketplacelistings"
+ available_in_toybox="true"
+ icon="Command_Marketplace_Icon"
+ label_ref="Command_MarketplaceListings_Label"
+ tooltip_ref="Command_MarketplaceListings_Tooltip"
+ execute_function="Floater.ToggleOrBringToFront"
+ execute_parameters="marketplace_listings"
+ is_running_function="Floater.IsOpen"
+ is_running_parameters="marketplace_listings"
+ />
<command name="minimap"
available_in_toybox="true"
icon="Command_MiniMap_Icon"
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index 000362ebfd..730f685d42 100755
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -4685,7 +4685,7 @@
<key>Type</key>
<string>U32</string>
<key>Value</key>
- <integer>21</integer>
+ <integer>20</integer>
</map>
<key>InventoryOutboxMaxFolderDepth</key>
<map>
@@ -4707,7 +4707,7 @@
<key>Type</key>
<string>U32</string>
<key>Value</key>
- <integer>200</integer>
+ <integer>100</integer>
</map>
<key>InventorySortOrder</key>
<map>
@@ -5556,6 +5556,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>