3 files changed, 24 insertions, 2 deletions
diff --git a/indra/newview/app_settings/commands.xml b/indra/newview/app_settings/commands.xml
index 60c942094a..fd74166980 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 8d3a7327b9..1966e71360 100755
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -4696,7 +4696,7 @@
       <key>Type</key>
       <string>U32</string>
       <key>Value</key>
-      <integer>21</integer>
+      <integer>20</integer>
     </map>
     <key>InventoryOutboxMaxFolderDepth</key>
     <map>
@@ -4718,7 +4718,7 @@
       <key>Type</key>
       <string>U32</string>
       <key>Value</key>
-      <integer>200</integer>
+      <integer>100</integer>
     </map>
     <key>InventorySortOrder</key>
     <map>
@@ -5567,6 +5567,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>
diff --git a/indra/newview/app_settings/toolbars.xml b/indra/newview/app_settings/toolbars.xml
index 86f9912815..69cae1b945 100755
--- a/indra/newview/app_settings/toolbars.xml
+++ b/indra/newview/app_settings/toolbars.xml
@@ -22,5 +22,6 @@
     <command name="voice"/>
     <command name="minimap"/>
     <command name="snapshot"/>
+    <command name="marketplacelistings"/>
   </left_toolbar>
 </toolbars>