From ea5a1546913eea3c2e145828ffe76fac6bdfaee9 Mon Sep 17 00:00:00 2001 From: Merov Linden Date: Tue, 15 Apr 2014 14:55:40 -0700 Subject: DD-49 : Add FUI button for Marketplace Listings --- indra/newview/app_settings/commands.xml | 10 ++++++++++ indra/newview/app_settings/toolbars.xml | 1 + 2 files changed, 11 insertions(+) (limited to 'indra/newview/app_settings') 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" /> + + -- cgit v1.2.3 From acdd70688bf2c53f50cb39781179bbffcb2a400d Mon Sep 17 00:00:00 2001 From: Merov Linden Date: Mon, 12 May 2014 14:58:17 -0700 Subject: DD-89 : Add a MarketplaceListingsLogging setting to get SLM API logs. DD-22 : Fixed the delete /listing route --- indra/newview/app_settings/settings.xml | 11 +++++++++++ 1 file changed, 11 insertions(+) (limited to 'indra/newview/app_settings') diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index de11309394..c18e9a12d8 100755 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -5546,6 +5546,17 @@ Value + MarketplaceListingsLogging + + Comment + Enable debug output associated with the Marketplace Listings (SLM) API. + Persist + 1 + Type + Boolean + Value + 0 + MarketplaceURL Comment -- cgit v1.2.3 From 7911e32d4bd9f86bdde5771dcaa14203befa5f7d Mon Sep 17 00:00:00 2001 From: Merov Linden Date: Thu, 5 Jun 2014 18:02:28 -0700 Subject: DD-114, DD-115, DD-116: Fixed counts on folder, folder depth and items on operations on marketplace listings --- indra/newview/app_settings/settings.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'indra/newview/app_settings') diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index 71715ed801..1966e71360 100755 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -4696,7 +4696,7 @@ Type U32 Value - 21 + 20 InventoryOutboxMaxFolderDepth @@ -4718,7 +4718,7 @@ Type U32 Value - 200 + 100 InventorySortOrder -- cgit v1.2.3 From f8098d2b0ff754d54b601b61edd49b67418e2060 Mon Sep 17 00:00:00 2001 From: Merov Linden Date: Thu, 2 Oct 2014 21:51:54 -0700 Subject: DD-174 : WIP : Use the correct icon for the marketplace listing FUI (toolbar) button --- indra/newview/app_settings/commands.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra/newview/app_settings') diff --git a/indra/newview/app_settings/commands.xml b/indra/newview/app_settings/commands.xml index 87ac7cce2c..9b12254ce3 100755 --- a/indra/newview/app_settings/commands.xml +++ b/indra/newview/app_settings/commands.xml @@ -120,7 +120,7 @@ /> Date: Sun, 5 Oct 2014 20:17:29 -0700 Subject: DD-170 : Handle 503 answer from SLM and added a MARKET_MERCHANT_NOT_MIGRATED state to the UI, showing only the relevant UI to the user (i.e. Merchant Outbox or Marketplace Listings). --- indra/newview/app_settings/commands.xml | 6 ++++-- indra/newview/app_settings/settings.xml | 22 +++++++++++----------- 2 files changed, 15 insertions(+), 13 deletions(-) (limited to 'indra/newview/app_settings') diff --git a/indra/newview/app_settings/commands.xml b/indra/newview/app_settings/commands.xml index 9b12254ce3..2cd6638042 100755 --- a/indra/newview/app_settings/commands.xml +++ b/indra/newview/app_settings/commands.xml @@ -123,8 +123,10 @@ icon="Command_MktListings_Icon" label_ref="Command_MarketplaceListings_Label" tooltip_ref="Command_MarketplaceListings_Tooltip" - execute_function="Floater.ToggleOrBringToFront" - execute_parameters="marketplace_listings" + execute_function="Marketplace.Toggle" + execute_parameters="marketplace" + is_enabled_function="Marketplace.Enabled" + is_enabled_parameters="marketplace" is_running_function="Floater.IsOpen" is_running_parameters="marketplace_listings" /> diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index abe477f38d..a666c72686 100755 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -4621,17 +4621,6 @@ Value 0 - InventoryDisplayOutbox - - Comment - Override merchant inventory outbox display - Persist - 0 - Type - Boolean - Value - 0 - InventoryInboxToggleState Comment @@ -4654,6 +4643,17 @@ Value 0 + InventoryOutboxDisplayBoth + + Comment + Show the legacy Merchant Outbox UI as well as the Marketplace Listings UI + Persist + 1 + Type + Boolean + Value + 0 + InventoryOutboxLogging Comment -- cgit v1.2.3 From 2939a542f97c5643457f0087915c733b949a0eb9 Mon Sep 17 00:00:00 2001 From: Merov Linden Date: Fri, 7 Nov 2014 16:47:19 -0800 Subject: DD-272 : Be more consistent when updating the count on hand in SLM, also prevent multiple folder update when receiving data from SLM --- indra/newview/app_settings/settings.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra/newview/app_settings') diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index 2d835fb2f7..dca2062211 100755 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -4718,7 +4718,7 @@ Type U32 Value - 100 + 200 InventorySortOrder -- cgit v1.2.3 From c7f24a69cfa0e87160d98325431c3098dcd8295b Mon Sep 17 00:00:00 2001 From: Merov Linden Date: Tue, 17 Mar 2015 12:59:37 -0700 Subject: DD-362 : WIP : Check stock folder count limit --- indra/newview/app_settings/settings.xml | 11 +++++++++++ 1 file changed, 11 insertions(+) (limited to 'indra/newview/app_settings') diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index 4a106c08e4..731f64e70e 100755 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -4742,6 +4742,17 @@ Value 200 + InventoryOutboxMaxStockItemCount + + Comment + Maximum number of items allowed in a stock folder. + Persist + 0 + Type + U32 + Value + 200 + InventorySortOrder Comment -- cgit v1.2.3 From 7816dfd5ac8ebb92f66c738d7f0ed61bbf7c0282 Mon Sep 17 00:00:00 2001 From: Merov Linden Date: Fri, 15 May 2015 20:10:45 -0700 Subject: DD-403: Make the sort order persistent in marketplace listings floater --- indra/newview/app_settings/settings.xml | 11 +++++++++++ 1 file changed, 11 insertions(+) (limited to 'indra/newview/app_settings') diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index 1b53a06a85..778020a92e 100755 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -4790,6 +4790,17 @@ Value 7 + MarketplaceListingsSortOrder + + Comment + Specifies sort for marketplace listings + Persist + 1 + Type + U32 + Value + 2 + InvertMouse Comment -- cgit v1.2.3