From a030b30d34ef3152791b123c4f52d4086f3eb549 Mon Sep 17 00:00:00 2001 From: Merov Linden Date: Thu, 6 Mar 2014 18:15:51 -0800 Subject: DD-4, DD-5, DD-6, DD-7, DD-8: WIP : Add Merchant Items panel and make it somewhat work, in a clunky sort of way --- .../default/xui/en/floater_merchant_items.xml | 121 +++++++++++++++++++++ indra/newview/skins/default/xui/en/menu_viewer.xml | 7 ++ .../xui/en/panel_merchant_items_inventory.xml | 32 ++++++ indra/newview/skins/default/xui/en/strings.xml | 5 + 4 files changed, 165 insertions(+) create mode 100755 indra/newview/skins/default/xui/en/floater_merchant_items.xml create mode 100755 indra/newview/skins/default/xui/en/panel_merchant_items_inventory.xml (limited to 'indra/newview/skins/default/xui/en') diff --git a/indra/newview/skins/default/xui/en/floater_merchant_items.xml b/indra/newview/skins/default/xui/en/floater_merchant_items.xml new file mode 100755 index 0000000000..2e54ed2ce3 --- /dev/null +++ b/indra/newview/skins/default/xui/en/floater_merchant_items.xml @@ -0,0 +1,121 @@ + + + + + + + Loading... + + + + + + + + Drag items you want to sell + + + + + + + + + + + + + + + + + + diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml index 64de010eb5..2dc974eff1 100755 --- a/indra/newview/skins/default/xui/en/menu_viewer.xml +++ b/indra/newview/skins/default/xui/en/menu_viewer.xml @@ -181,6 +181,13 @@ function="Floater.ToggleOrBringToFront" parameter="outbox" /> + + + diff --git a/indra/newview/skins/default/xui/en/panel_merchant_items_inventory.xml b/indra/newview/skins/default/xui/en/panel_merchant_items_inventory.xml new file mode 100755 index 0000000000..a013516267 --- /dev/null +++ b/indra/newview/skins/default/xui/en/panel_merchant_items_inventory.xml @@ -0,0 +1,32 @@ + + + + + diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml index 9300652eaa..515e912ee5 100755 --- a/indra/newview/skins/default/xui/en/strings.xml +++ b/indra/newview/skins/default/xui/en/strings.xml @@ -2219,6 +2219,11 @@ We are accessing your account on the [[MARKETPLACE_CREATE_STORE_URL] Marketplace The [[MARKETPLACE_CREATE_STORE_URL] Marketplace store] is returning errors. + Your Merchant Items folder is empty. + + + Drag folders to this area to list them for sale on the [[MARKETPLACE_DASHBOARD_URL] Marketplace]. + No errors Error: Before sending items to the Marketplace you will need to set yourself up as a merchant (free of charge). -- cgit v1.2.3 From 705d4182c8a84728e7f00cf48110c8f9720e4c29 Mon Sep 17 00:00:00 2001 From: Merov Linden Date: Thu, 13 Mar 2014 16:45:52 -0700 Subject: DD-42 : Rename merchant items to marketplace listings to be consistent with spec --- .../xui/en/floater_marketplace_listings.xml | 121 +++++++++++++++++++++ .../default/xui/en/floater_merchant_items.xml | 121 --------------------- indra/newview/skins/default/xui/en/menu_viewer.xml | 6 +- .../en/panel_marketplace_listings_inventory.xml | 32 ++++++ .../xui/en/panel_merchant_items_inventory.xml | 32 ------ indra/newview/skins/default/xui/en/strings.xml | 6 +- 6 files changed, 159 insertions(+), 159 deletions(-) create mode 100755 indra/newview/skins/default/xui/en/floater_marketplace_listings.xml delete mode 100755 indra/newview/skins/default/xui/en/floater_merchant_items.xml create mode 100755 indra/newview/skins/default/xui/en/panel_marketplace_listings_inventory.xml delete mode 100755 indra/newview/skins/default/xui/en/panel_merchant_items_inventory.xml (limited to 'indra/newview/skins/default/xui/en') diff --git a/indra/newview/skins/default/xui/en/floater_marketplace_listings.xml b/indra/newview/skins/default/xui/en/floater_marketplace_listings.xml new file mode 100755 index 0000000000..94a9466c16 --- /dev/null +++ b/indra/newview/skins/default/xui/en/floater_marketplace_listings.xml @@ -0,0 +1,121 @@ + + + + + + + Loading... + + + + + + + + Drag items you want to sell + + + + + + + + + + + + + + + + + + diff --git a/indra/newview/skins/default/xui/en/floater_merchant_items.xml b/indra/newview/skins/default/xui/en/floater_merchant_items.xml deleted file mode 100755 index 2e54ed2ce3..0000000000 --- a/indra/newview/skins/default/xui/en/floater_merchant_items.xml +++ /dev/null @@ -1,121 +0,0 @@ - - - - - - - Loading... - - - - - - - - Drag items you want to sell - - - - - - - - - - - - - - - - - - diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml index 2dc974eff1..a8e02a9d02 100755 --- a/indra/newview/skins/default/xui/en/menu_viewer.xml +++ b/indra/newview/skins/default/xui/en/menu_viewer.xml @@ -182,11 +182,11 @@ parameter="outbox" /> + label="Marketplace listings..." + name="MarketplaceListings"> + parameter="marketplace_listings" /> + + + + diff --git a/indra/newview/skins/default/xui/en/panel_merchant_items_inventory.xml b/indra/newview/skins/default/xui/en/panel_merchant_items_inventory.xml deleted file mode 100755 index a013516267..0000000000 --- a/indra/newview/skins/default/xui/en/panel_merchant_items_inventory.xml +++ /dev/null @@ -1,32 +0,0 @@ - - - - - diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml index 515e912ee5..387ad138d9 100755 --- a/indra/newview/skins/default/xui/en/strings.xml +++ b/indra/newview/skins/default/xui/en/strings.xml @@ -2219,9 +2219,9 @@ We are accessing your account on the [[MARKETPLACE_CREATE_STORE_URL] Marketplace The [[MARKETPLACE_CREATE_STORE_URL] Marketplace store] is returning errors. - Your Merchant Items folder is empty. - - + Your Marketplace Listings folder is empty. + + Drag folders to this area to list them for sale on the [[MARKETPLACE_DASHBOARD_URL] Marketplace]. -- cgit v1.2.3 From 68dbb5692f11eed39175ebf3313d96b5430231f9 Mon Sep 17 00:00:00 2001 From: Merov Linden Date: Fri, 14 Mar 2014 17:34:15 -0700 Subject: DD-17 : WIP : Add live status to active listing folders, clean up getLabelSuffix() code a bit --- indra/newview/skins/default/xui/en/strings.xml | 3 +++ 1 file changed, 3 insertions(+) (limited to 'indra/newview/skins/default/xui/en') diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml index 387ad138d9..1d3c112495 100755 --- a/indra/newview/skins/default/xui/en/strings.xml +++ b/indra/newview/skins/default/xui/en/strings.xml @@ -2235,6 +2235,9 @@ The [[MARKETPLACE_CREATE_STORE_URL] Marketplace store] is returning errors. Error: This item can not be sold on the marketplace. Error: There was a problem with this item. Try again later. + no Mkt ID + live + Open landmarks -- cgit v1.2.3 From 28fe8352549c0fd99da0c3f0119d96386e52a703 Mon Sep 17 00:00:00 2001 From: Merov Linden Date: Tue, 18 Mar 2014 13:03:04 -0700 Subject: DD-17, DD-40 : Style active listings in bold, implement a working initialization indicator --- .../default/xui/en/floater_marketplace_listings.xml | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) (limited to 'indra/newview/skins/default/xui/en') diff --git a/indra/newview/skins/default/xui/en/floater_marketplace_listings.xml b/indra/newview/skins/default/xui/en/floater_marketplace_listings.xml index 94a9466c16..b212518f85 100755 --- a/indra/newview/skins/default/xui/en/floater_marketplace_listings.xml +++ b/indra/newview/skins/default/xui/en/floater_marketplace_listings.xml @@ -13,6 +13,7 @@ reuse_instance="true" title="MARKETPLACE LISTINGS" width="333"> + Initializing... + - + -- cgit v1.2.3 From e08296f6dc44c1b18b1ca36a0ee7dc2f8578d84b Mon Sep 17 00:00:00 2001 From: Merov Linden Date: Tue, 18 Mar 2014 15:14:09 -0700 Subject: DD-40 : WIP : Got rid o the useless Drop Target text (not part of that UI) --- .../xui/en/floater_marketplace_listings.xml | 40 ++++------------------ 1 file changed, 6 insertions(+), 34 deletions(-) (limited to 'indra/newview/skins/default/xui/en') diff --git a/indra/newview/skins/default/xui/en/floater_marketplace_listings.xml b/indra/newview/skins/default/xui/en/floater_marketplace_listings.xml index b212518f85..625b71645e 100755 --- a/indra/newview/skins/default/xui/en/floater_marketplace_listings.xml +++ b/indra/newview/skins/default/xui/en/floater_marketplace_listings.xml @@ -66,40 +66,12 @@ - - - Drag items you want to sell - - - + Date: Tue, 18 Mar 2014 16:36:50 -0700 Subject: DD-50 : WIP : Add tabs to the marketplace listing UI --- .../en/panel_marketplace_listings_inventory.xml | 151 ++++++++++++++++----- 1 file changed, 120 insertions(+), 31 deletions(-) (limited to 'indra/newview/skins/default/xui/en') diff --git a/indra/newview/skins/default/xui/en/panel_marketplace_listings_inventory.xml b/indra/newview/skins/default/xui/en/panel_marketplace_listings_inventory.xml index dcb634fe59..33ac08d87f 100755 --- a/indra/newview/skins/default/xui/en/panel_marketplace_listings_inventory.xml +++ b/indra/newview/skins/default/xui/en/panel_marketplace_listings_inventory.xml @@ -1,32 +1,121 @@ - - - - + + + + + + + + + + + + + + \ No newline at end of file -- cgit v1.2.3 From 15c0907942ae2e82876d4aaf25ab342da0bcf61e Mon Sep 17 00:00:00 2001 From: Merov Linden Date: Tue, 18 Mar 2014 20:59:49 -0700 Subject: DD-50 : Tabs added to the marketplace, fixed XUI, sorting not implemented yet --- .../xui/en/floater_marketplace_listings.xml | 122 ++++++++++----------- .../en/panel_marketplace_listings_inventory.xml | 2 +- 2 files changed, 62 insertions(+), 62 deletions(-) (limited to 'indra/newview/skins/default/xui/en') diff --git a/indra/newview/skins/default/xui/en/floater_marketplace_listings.xml b/indra/newview/skins/default/xui/en/floater_marketplace_listings.xml index 625b71645e..80d6187e1e 100755 --- a/indra/newview/skins/default/xui/en/floater_marketplace_listings.xml +++ b/indra/newview/skins/default/xui/en/floater_marketplace_listings.xml @@ -1,82 +1,82 @@ + Initializing... + - Initializing... - - + - - - Loading... - - - + + Loading... + + + + height="20"> Date: Wed, 19 Mar 2014 09:09:13 -0700 Subject: DD-10 : WIP : Added embryonic tool strip at the top of the marketplace floater --- .../en/panel_marketplace_listings_inventory.xml | 245 +++++++++++---------- 1 file changed, 131 insertions(+), 114 deletions(-) (limited to 'indra/newview/skins/default/xui/en') diff --git a/indra/newview/skins/default/xui/en/panel_marketplace_listings_inventory.xml b/indra/newview/skins/default/xui/en/panel_marketplace_listings_inventory.xml index 4947cb57a2..89020c7e80 100755 --- a/indra/newview/skins/default/xui/en/panel_marketplace_listings_inventory.xml +++ b/indra/newview/skins/default/xui/en/panel_marketplace_listings_inventory.xml @@ -1,121 +1,138 @@ + + + + + - - - - - - - - - - - - + height="340" + halign="center" + tab_height="30" + tab_group="1" + tab_position="top" + tab_min_width="50"> + + + + + + + + + + \ No newline at end of file -- cgit v1.2.3 From 03622e0833fd2d2bdcc9ed3ed0c009ad9e9fee3e Mon Sep 17 00:00:00 2001 From: Merov Linden Date: Thu, 20 Mar 2014 09:31:35 -0700 Subject: DD-50 : Adding new filter code for marketplace filtered tabs (active, unactive and unassociated) --- .../skins/default/xui/en/panel_marketplace_listings_inventory.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra/newview/skins/default/xui/en') diff --git a/indra/newview/skins/default/xui/en/panel_marketplace_listings_inventory.xml b/indra/newview/skins/default/xui/en/panel_marketplace_listings_inventory.xml index 89020c7e80..3c184ba54b 100755 --- a/indra/newview/skins/default/xui/en/panel_marketplace_listings_inventory.xml +++ b/indra/newview/skins/default/xui/en/panel_marketplace_listings_inventory.xml @@ -37,7 +37,7 @@ width="308" height="340"> Date: Thu, 20 Mar 2014 16:39:30 -0700 Subject: DD-16 : WIP : Update sort / show menu, not actionable yet though --- .../skins/default/xui/en/menu_marketplace_view.xml | 49 ++++++++++++++++++++++ .../en/panel_marketplace_listings_inventory.xml | 2 +- 2 files changed, 50 insertions(+), 1 deletion(-) create mode 100755 indra/newview/skins/default/xui/en/menu_marketplace_view.xml (limited to 'indra/newview/skins/default/xui/en') diff --git a/indra/newview/skins/default/xui/en/menu_marketplace_view.xml b/indra/newview/skins/default/xui/en/menu_marketplace_view.xml new file mode 100755 index 0000000000..6d31ff4960 --- /dev/null +++ b/indra/newview/skins/default/xui/en/menu_marketplace_view.xml @@ -0,0 +1,49 @@ + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/indra/newview/skins/default/xui/en/panel_marketplace_listings_inventory.xml b/indra/newview/skins/default/xui/en/panel_marketplace_listings_inventory.xml index 3c184ba54b..54fc3a0c0f 100755 --- a/indra/newview/skins/default/xui/en/panel_marketplace_listings_inventory.xml +++ b/indra/newview/skins/default/xui/en/panel_marketplace_listings_inventory.xml @@ -23,7 +23,7 @@ width="31" height="25" left="2" - menu_filename="menu_people_nearby_view.xml" + menu_filename="menu_marketplace_view.xml" image_hover_unselected="Toolbar_Middle_Over" image_overlay="Conv_toolbar_sort" image_selected="Toolbar_Middle_Selected" -- cgit v1.2.3 From 5b0882872871a5601b216655ea408a2a9675f159 Mon Sep 17 00:00:00 2001 From: Merov Linden Date: Fri, 21 Mar 2014 15:43:07 -0700 Subject: DD-16 : WIP : More code on sort/show menu but still not actionable. --- .../skins/default/xui/en/menu_marketplace_view.xml | 28 +++++++++++----------- 1 file changed, 14 insertions(+), 14 deletions(-) (limited to 'indra/newview/skins/default/xui/en') diff --git a/indra/newview/skins/default/xui/en/menu_marketplace_view.xml b/indra/newview/skins/default/xui/en/menu_marketplace_view.xml index 6d31ff4960..36c73b9f4b 100755 --- a/indra/newview/skins/default/xui/en/menu_marketplace_view.xml +++ b/indra/newview/skins/default/xui/en/menu_marketplace_view.xml @@ -1,6 +1,6 @@ - + + function="Marketplace.ViewSort.Action" + parameter="show_all" /> + function="Marketplace.ViewSort.CheckItem" + parameter="show_all" /> - + + function="People.Nearby.ViewSort.Action" + parameter="show_active" /> + function="People.Nearby.ViewSort.CheckItem" + parameter="show_active" /> - + + parameter="show_inactive_listings" /> + parameter="show_inactive_listings" /> -- cgit v1.2.3 From f813a25224081e68d4772676909d2cff14407486 Mon Sep 17 00:00:00 2001 From: Merov Linden Date: Tue, 25 Mar 2014 10:22:10 -0700 Subject: DD-10 : WIP : Some XUI clean up, menu still not working --- .../skins/default/xui/en/menu_marketplace_view.xml | 4 +- .../default/xui/en/panel_marketplace_listings.xml | 138 +++++++++++++++++++++ .../en/panel_marketplace_listings_inventory.xml | 138 --------------------- 3 files changed, 140 insertions(+), 140 deletions(-) create mode 100755 indra/newview/skins/default/xui/en/panel_marketplace_listings.xml delete mode 100755 indra/newview/skins/default/xui/en/panel_marketplace_listings_inventory.xml (limited to 'indra/newview/skins/default/xui/en') diff --git a/indra/newview/skins/default/xui/en/menu_marketplace_view.xml b/indra/newview/skins/default/xui/en/menu_marketplace_view.xml index 36c73b9f4b..9ed93e2f11 100755 --- a/indra/newview/skins/default/xui/en/menu_marketplace_view.xml +++ b/indra/newview/skins/default/xui/en/menu_marketplace_view.xml @@ -32,10 +32,10 @@ diff --git a/indra/newview/skins/default/xui/en/panel_marketplace_listings.xml b/indra/newview/skins/default/xui/en/panel_marketplace_listings.xml new file mode 100755 index 0000000000..54fc3a0c0f --- /dev/null +++ b/indra/newview/skins/default/xui/en/panel_marketplace_listings.xml @@ -0,0 +1,138 @@ + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/indra/newview/skins/default/xui/en/panel_marketplace_listings_inventory.xml b/indra/newview/skins/default/xui/en/panel_marketplace_listings_inventory.xml deleted file mode 100755 index 54fc3a0c0f..0000000000 --- a/indra/newview/skins/default/xui/en/panel_marketplace_listings_inventory.xml +++ /dev/null @@ -1,138 +0,0 @@ - - - - - - - - - - - - - - - - - - \ No newline at end of file -- cgit v1.2.3 From 48b6a713be449f39b33b3de190b3caccd5ad55a2 Mon Sep 17 00:00:00 2001 From: Merov Linden Date: Wed, 26 Mar 2014 10:55:42 -0700 Subject: DD-10 : Make the filter tool works in All tab and finished refactor --- .../skins/default/xui/en/floater_marketplace_listings.xml | 8 +++++++- indra/newview/skins/default/xui/en/menu_marketplace_view.xml | 12 ++++++------ 2 files changed, 13 insertions(+), 7 deletions(-) (limited to 'indra/newview/skins/default/xui/en') diff --git a/indra/newview/skins/default/xui/en/floater_marketplace_listings.xml b/indra/newview/skins/default/xui/en/floater_marketplace_listings.xml index 80d6187e1e..0f511c4a66 100755 --- a/indra/newview/skins/default/xui/en/floater_marketplace_listings.xml +++ b/indra/newview/skins/default/xui/en/floater_marketplace_listings.xml @@ -64,7 +64,13 @@ wrap="true" halign="left" /> - + + - + + parameter="show_unassociated" /> + parameter="show_unassociated" /> - + + parameter="show_inactive" /> + parameter="show_inactive" /> -- cgit v1.2.3 From 0ec8fbec6deaa24506391ef239c50009eebe1eef Mon Sep 17 00:00:00 2001 From: Merov Linden Date: Fri, 28 Mar 2014 15:54:36 -0700 Subject: DD-24 : Add FT_MARKETPLACE_STOCK as a new type for folders, implement the promotion code for Drag and Drop, display of stock folders and embryonic marketplace validation --- indra/newview/skins/default/xui/en/strings.xml | 1 + 1 file changed, 1 insertion(+) (limited to 'indra/newview/skins/default/xui/en') diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml index 80b520622a..ce9bbbc8d2 100755 --- a/indra/newview/skins/default/xui/en/strings.xml +++ b/indra/newview/skins/default/xui/en/strings.xml @@ -2273,6 +2273,7 @@ The [[MARKETPLACE_CREATE_STORE_URL] Marketplace store] is returning errors. no Mkt ID live + stock Open landmarks -- cgit v1.2.3 From c36b7fa963511023866b6518f245d2c6edd1add0 Mon Sep 17 00:00:00 2001 From: Merov Linden Date: Thu, 3 Apr 2014 18:14:59 -0700 Subject: DD-20 : Make drop in the panel when empty work again --- .../newview/skins/default/xui/en/floater_marketplace_listings.xml | 3 ++- indra/newview/skins/default/xui/en/panel_marketplace_listings.xml | 8 ++++---- 2 files changed, 6 insertions(+), 5 deletions(-) (limited to 'indra/newview/skins/default/xui/en') diff --git a/indra/newview/skins/default/xui/en/floater_marketplace_listings.xml b/indra/newview/skins/default/xui/en/floater_marketplace_listings.xml index 0f511c4a66..f5630aeecb 100755 --- a/indra/newview/skins/default/xui/en/floater_marketplace_listings.xml +++ b/indra/newview/skins/default/xui/en/floater_marketplace_listings.xml @@ -15,11 +15,11 @@ reuse_instance="true"> Initializing... Date: Fri, 4 Apr 2014 12:33:40 -0700 Subject: DD-45 : Add Activate right click menu item to marketplace listings folders --- indra/newview/skins/default/xui/en/menu_inventory.xml | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'indra/newview/skins/default/xui/en') diff --git a/indra/newview/skins/default/xui/en/menu_inventory.xml b/indra/newview/skins/default/xui/en/menu_inventory.xml index 6fa45d7d66..aa115c1ad1 100755 --- a/indra/newview/skins/default/xui/en/menu_inventory.xml +++ b/indra/newview/skins/default/xui/en/menu_inventory.xml @@ -726,6 +726,14 @@ parameter="send_to_marketplace" /> + + + -- cgit v1.2.3 From e1d2f71d348bafe0be783dcb3dfbeb56bc877c12 Mon Sep 17 00:00:00 2001 From: Merov Linden Date: Fri, 4 Apr 2014 16:56:17 -0700 Subject: DD-14 : Add all right click menu items for marketplace. Make Add, Activate and Deactivate work. Right click fails on non folder items though in marketplace --- .../skins/default/xui/en/menu_inventory.xml | 51 ++++++++++++++++++---- 1 file changed, 43 insertions(+), 8 deletions(-) (limited to 'indra/newview/skins/default/xui/en') diff --git a/indra/newview/skins/default/xui/en/menu_inventory.xml b/indra/newview/skins/default/xui/en/menu_inventory.xml index aa115c1ad1..cde14e72f0 100755 --- a/indra/newview/skins/default/xui/en/menu_inventory.xml +++ b/indra/newview/skins/default/xui/en/menu_inventory.xml @@ -4,6 +4,49 @@ layout="topleft" name="Popup" visible="false"> + + + + + + + + + + + + + + + + - - - -- cgit v1.2.3 From fc4e9d2572635903449ade6ebf2a45aa9e971023 Mon Sep 17 00:00:00 2001 From: Merov Linden Date: Tue, 8 Apr 2014 18:12:48 -0700 Subject: DD-18 : Compute stock for all levels, get folders to update more consistently on all actions in the marketplace --- indra/newview/skins/default/xui/en/strings.xml | 1 + 1 file changed, 1 insertion(+) (limited to 'indra/newview/skins/default/xui/en') diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml index ce9bbbc8d2..55272750e7 100755 --- a/indra/newview/skins/default/xui/en/strings.xml +++ b/indra/newview/skins/default/xui/en/strings.xml @@ -2274,6 +2274,7 @@ The [[MARKETPLACE_CREATE_STORE_URL] Marketplace store] is returning errors. no Mkt ID live stock + out of stock Open landmarks -- cgit v1.2.3 From 748bbeaf982c456b120d4b3f4d33aa6dce576908 Mon Sep 17 00:00:00 2001 From: Merov Linden Date: Wed, 9 Apr 2014 14:19:38 -0700 Subject: DD-13 : Clean up Associate/Disassociate listing. Also clarify the update folder code in marketplace --- indra/newview/skins/default/xui/en/menu_inventory.xml | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) (limited to 'indra/newview/skins/default/xui/en') diff --git a/indra/newview/skins/default/xui/en/menu_inventory.xml b/indra/newview/skins/default/xui/en/menu_inventory.xml index cde14e72f0..0be5509333 100755 --- a/indra/newview/skins/default/xui/en/menu_inventory.xml +++ b/indra/newview/skins/default/xui/en/menu_inventory.xml @@ -5,12 +5,12 @@ name="Popup" visible="false"> + name="Marketplace Associate Listing"> + parameter="marketplace_associate_listing" /> + + + -- cgit v1.2.3 From a0f5a63a661d3ebc03e82463897c63dd35918749 Mon Sep 17 00:00:00 2001 From: Merov Linden Date: Wed, 9 Apr 2014 15:51:28 -0700 Subject: DD-16 : WIP : Fix filtering on menu and tabs. Sort still not done --- indra/newview/skins/default/xui/en/menu_marketplace_view.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra/newview/skins/default/xui/en') diff --git a/indra/newview/skins/default/xui/en/menu_marketplace_view.xml b/indra/newview/skins/default/xui/en/menu_marketplace_view.xml index 4043c5c93d..d08cb23483 100755 --- a/indra/newview/skins/default/xui/en/menu_marketplace_view.xml +++ b/indra/newview/skins/default/xui/en/menu_marketplace_view.xml @@ -30,7 +30,7 @@ function="Marketplace.ViewSort.CheckItem" parameter="show_unassociated" /> - + -- cgit v1.2.3 From 2a031df763ab7ea0f17f263ef9a03f53fbfb1187 Mon Sep 17 00:00:00 2001 From: Merov Linden Date: Fri, 11 Apr 2014 11:55:57 -0700 Subject: DD-12, DD-19 : Add a button to create a new listing folder. Also added a validate button though it does nothing ATM --- .../default/xui/en/panel_marketplace_listings.xml | 24 ++++++++++++++++++++++ 1 file changed, 24 insertions(+) (limited to 'indra/newview/skins/default/xui/en') diff --git a/indra/newview/skins/default/xui/en/panel_marketplace_listings.xml b/indra/newview/skins/default/xui/en/panel_marketplace_listings.xml index 45e0fe04c0..3b48c2e48c 100755 --- a/indra/newview/skins/default/xui/en/panel_marketplace_listings.xml +++ b/indra/newview/skins/default/xui/en/panel_marketplace_listings.xml @@ -28,6 +28,30 @@ image_selected="Toolbar_Middle_Selected" image_unselected="Toolbar_Middle_Off" menu_position="bottomleft"/> + - \ No newline at end of file diff --git a/indra/newview/skins/default/xui/en/panel_snapshot_postcard.xml b/indra/newview/skins/default/xui/en/panel_snapshot_postcard.xml deleted file mode 100755 index 975b08be05..0000000000 --- a/indra/newview/skins/default/xui/en/panel_snapshot_postcard.xml +++ /dev/null @@ -1,103 +0,0 @@ - - - - Postcard from [SECOND_LIFE]. - - - Check this out! - - - Sending... - - - - E-mail - - - - - - - - - \ No newline at end of file -- cgit v1.2.3 From 9ce64ec527f7b49b1641753ce6e67b8ed7f603c7 Mon Sep 17 00:00:00 2001 From: Merov Linden Date: Tue, 10 Feb 2015 22:40:28 -0800 Subject: DD-324 : Alert the user when we split a stock folder --- indra/newview/skins/default/xui/en/notifications.xml | 12 ++++++++++++ 1 file changed, 12 insertions(+) (limited to 'indra/newview/skins/default/xui/en') diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml index 570a69256d..c4ae29b363 100755 --- a/indra/newview/skins/default/xui/en/notifications.xml +++ b/indra/newview/skins/default/xui/en/notifications.xml @@ -485,6 +485,18 @@ This listing could not be updated. yestext="OK"/> + + We have separated stock items of different types into separate stock folders, so your folder is arranged in a way that we can list it. + confirm + + + Date: Thu, 26 Feb 2015 12:12:08 +0200 Subject: MAINT-4904 FIXED Show confirmation pop-up before unlinking an object. --- indra/newview/skins/default/xui/en/notifications.xml | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) (limited to 'indra/newview/skins/default/xui/en') diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml index 4602a41d52..df4bf6700b 100755 --- a/indra/newview/skins/default/xui/en/notifications.xml +++ b/indra/newview/skins/default/xui/en/notifications.xml @@ -5365,7 +5365,21 @@ You cannot undo this action. notext="Cancel" yestext="OK"/> - + + + + This is a large linkset. If you unlink it, you may not be able to link it again. You may wish to take a copy of the linkset into your inventory as a precaution. + confirm + + + Date: Wed, 4 Mar 2015 15:55:23 +0200 Subject: MAINT-4939 FIXED Remove Abuse Report Pop-Up Dialog --- indra/newview/skins/default/xui/en/notifications.xml | 11 ----------- 1 file changed, 11 deletions(-) (limited to 'indra/newview/skins/default/xui/en') diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml index df4bf6700b..30ff90d1fd 100755 --- a/indra/newview/skins/default/xui/en/notifications.xml +++ b/indra/newview/skins/default/xui/en/notifications.xml @@ -5379,17 +5379,6 @@ You cannot undo this action. notext="Cancel" yestext="Unlink"/> - - - - -Use this tool to report violations of the [http://secondlife.com/corporate/tos.php Terms of Service] and [http://secondlife.com/corporate/cs.php Community Standards]. - -All reported abuses are investigated and resolved. - Date: Thu, 5 Mar 2015 21:58:57 -0800 Subject: DD-339 : Adding loading indicator to marketplace floater when the listings data and inventory data are being fetched --- indra/newview/skins/default/xui/en/floater_marketplace_listings.xml | 1 - 1 file changed, 1 deletion(-) (limited to 'indra/newview/skins/default/xui/en') diff --git a/indra/newview/skins/default/xui/en/floater_marketplace_listings.xml b/indra/newview/skins/default/xui/en/floater_marketplace_listings.xml index 8f58146a48..0806a87288 100755 --- a/indra/newview/skins/default/xui/en/floater_marketplace_listings.xml +++ b/indra/newview/skins/default/xui/en/floater_marketplace_listings.xml @@ -13,7 +13,6 @@ save_rect="true" save_visibility="false" reuse_instance="true"> - Initializing... Date: Wed, 11 Mar 2015 11:39:32 +0200 Subject: MAINT-4985 FIXED Update Return All Confirmation Message to Reflect Impact --- indra/newview/skins/default/xui/en/notifications.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra/newview/skins/default/xui/en') diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml index 30ff90d1fd..39e09cae79 100755 --- a/indra/newview/skins/default/xui/en/notifications.xml +++ b/indra/newview/skins/default/xui/en/notifications.xml @@ -783,7 +783,7 @@ Objects: [N] icon="alertmodal.tga" name="ReturnAllTopObjects" type="alertmodal"> -Are you sure you want to return all listed objects back to their owner's inventory? +Are you sure you want to return all listed objects back to their owner's inventory? This will return ALL scripted objects in the region! confirm Date: Tue, 17 Mar 2015 12:59:37 -0700 Subject: DD-362 : WIP : Check stock folder count limit --- indra/newview/skins/default/xui/en/strings.xml | 1 + 1 file changed, 1 insertion(+) (limited to 'indra/newview/skins/default/xui/en') diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml index 76f4de1400..49630adb93 100755 --- a/indra/newview/skins/default/xui/en/strings.xml +++ b/indra/newview/skins/default/xui/en/strings.xml @@ -241,6 +241,7 @@ Please try logging in again in a minute. Depth of nested folders exceeds [AMOUNT]. Decrease the depth of folders-within-folders; box items if necessary. Subfolder count exceeds [AMOUNT]. Decrease the number of folders in your listing; box items if necessary. Item count exceeds [AMOUNT]. In order to sell more than [AMOUNT] items in one listing, you must box some of them. + Stock folder count exceeds [AMOUNT]. You can only drop items or folders in the ALL tab. Please select that tab and move your item(s) or folder(s) again. One or more of these objects cannot be sold or transferred You can only put items from your inventory on the marketplace -- cgit v1.2.3 From 7e2a449b4e5bd2beeff1c6543e4f893fc38f0fe8 Mon Sep 17 00:00:00 2001 From: Merov Linden Date: Tue, 17 Mar 2015 15:31:32 -0700 Subject: DD-362 : Limit the admissible total of stock items, fail validation if above the threshold --- indra/newview/skins/default/xui/en/strings.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra/newview/skins/default/xui/en') diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml index 49630adb93..f69884a2a9 100755 --- a/indra/newview/skins/default/xui/en/strings.xml +++ b/indra/newview/skins/default/xui/en/strings.xml @@ -241,7 +241,7 @@ Please try logging in again in a minute. Depth of nested folders exceeds [AMOUNT]. Decrease the depth of folders-within-folders; box items if necessary. Subfolder count exceeds [AMOUNT]. Decrease the number of folders in your listing; box items if necessary. Item count exceeds [AMOUNT]. In order to sell more than [AMOUNT] items in one listing, you must box some of them. - Stock folder count exceeds [AMOUNT]. + Stock items count exceeds [AMOUNT]. You can only drop items or folders in the ALL tab. Please select that tab and move your item(s) or folder(s) again. One or more of these objects cannot be sold or transferred You can only put items from your inventory on the marketplace -- cgit v1.2.3 From b4d22741a6118719d45f278ed64f2c4635f0058e Mon Sep 17 00:00:00 2001 From: Merov Linden Date: Wed, 18 Mar 2015 17:06:18 -0700 Subject: DD-337 : Validate the version folder before setting it and show error dialog if error --- indra/newview/skins/default/xui/en/notifications.xml | 13 +++++++++++++ 1 file changed, 13 insertions(+) (limited to 'indra/newview/skins/default/xui/en') diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml index 6d672d29f1..8453152613 100755 --- a/indra/newview/skins/default/xui/en/notifications.xml +++ b/indra/newview/skins/default/xui/en/notifications.xml @@ -373,6 +373,19 @@ Initialization with the Marketplace failed because of a system or network error. yestext="OK"/> + + Activating this version folder failed with error : + + '[ERROR_CODE]' + + + + Date: Fri, 20 Mar 2015 13:49:25 -0700 Subject: DD-337 : Update error message as requested by Producer --- indra/newview/skins/default/xui/en/notifications.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra/newview/skins/default/xui/en') diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml index 8453152613..541a240745 100755 --- a/indra/newview/skins/default/xui/en/notifications.xml +++ b/indra/newview/skins/default/xui/en/notifications.xml @@ -353,7 +353,7 @@ Initialization with the Marketplace failed because of a system or network error. icon="OutboxStatus_Error" name="MerchantUnprocessableEntity" type="outbox"> - We are unable to list this product. Usually this is caused by missing information in the listing description form. If you continue to see this error, try again later. + We are unable to list this product or activate the version folder. Usually this is caused by missing information in the listing description form, but it may be due to errors in the folder structure. Either edit the listing or check the listing folder for errors. Date: Mon, 30 Mar 2015 20:01:02 +0300 Subject: MAINT-5037 FIXED Viewer is operable under the leaving call confirmation dialog --- indra/newview/skins/default/xui/en/notifications.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra/newview/skins/default/xui/en') diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml index 39e09cae79..05b903b4bf 100755 --- a/indra/newview/skins/default/xui/en/notifications.xml +++ b/indra/newview/skins/default/xui/en/notifications.xml @@ -8017,7 +8017,7 @@ We cannot display a preview of this texture because it is no-copy and/or no-tran + type="alertmodal"> Are you sure you want to leave this call? confirm voice -- cgit v1.2.3 From 8e117983808f7b4f9d4aa288ec48cea5f0f89536 Mon Sep 17 00:00:00 2001 From: Merov Linden Date: Thu, 2 Apr 2015 14:01:03 -0700 Subject: DD-338 : Auto unlist when stock gets to 0 during stock folder manipulation --- indra/newview/skins/default/xui/en/notifications.xml | 12 ++++++++++++ 1 file changed, 12 insertions(+) (limited to 'indra/newview/skins/default/xui/en') diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml index 541a240745..97885a0ce6 100755 --- a/indra/newview/skins/default/xui/en/notifications.xml +++ b/indra/newview/skins/default/xui/en/notifications.xml @@ -517,6 +517,18 @@ This listing could not be updated. + We have unlisted your listing because the stock is empty. You need to add more units to the stock folder to list the listing again. + confirm + + + + -- cgit v1.2.3 From 12d19eec352e82314ac1ff3dfbfd5c9b9aa74a31 Mon Sep 17 00:00:00 2001 From: Mnikolenko ProductEngine Date: Fri, 3 Apr 2015 12:48:20 +0300 Subject: MAINT-5041 FIXED Current Window snapshot option is restored. Hide height/width spinners when selecting this option. --- indra/newview/skins/default/xui/en/panel_snapshot_inventory.xml | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'indra/newview/skins/default/xui/en') diff --git a/indra/newview/skins/default/xui/en/panel_snapshot_inventory.xml b/indra/newview/skins/default/xui/en/panel_snapshot_inventory.xml index ea579c6dae..d019a0a310 100755 --- a/indra/newview/skins/default/xui/en/panel_snapshot_inventory.xml +++ b/indra/newview/skins/default/xui/en/panel_snapshot_inventory.xml @@ -59,6 +59,10 @@ label="Large (512x512)" name="Large(512x512)" value="[i512,i512]" /> + Date: Wed, 6 May 2015 23:47:44 -0700 Subject: DD-403 : Add sort by name and by most recent --- .../skins/default/xui/en/menu_marketplace_view.xml | 38 +++++++++++++++++----- 1 file changed, 30 insertions(+), 8 deletions(-) (limited to 'indra/newview/skins/default/xui/en') diff --git a/indra/newview/skins/default/xui/en/menu_marketplace_view.xml b/indra/newview/skins/default/xui/en/menu_marketplace_view.xml index a9e9b5a28f..4b3bb8ee1c 100755 --- a/indra/newview/skins/default/xui/en/menu_marketplace_view.xml +++ b/indra/newview/skins/default/xui/en/menu_marketplace_view.xml @@ -4,15 +4,37 @@ left="0" bottom="0" visible="false" mouse_opaque="false"> - - + label="Sort by name" + name="sort_by_name"> + + + + + + + + + + + -- cgit v1.2.3 From 604914a7bd309de176901b9d14991e525a90d649 Mon Sep 17 00:00:00 2001 From: Mnikolenko ProductEngine Date: Thu, 7 May 2015 16:22:44 +0300 Subject: MAINT-4812 Restore sending snapshot as email from the viewer. --- .../skins/default/xui/en/floater_snapshot.xml | 6 ++ .../default/xui/en/panel_snapshot_options.xml | 17 ++++ .../default/xui/en/panel_snapshot_postcard.xml | 103 +++++++++++++++++++++ 3 files changed, 126 insertions(+) create mode 100644 indra/newview/skins/default/xui/en/panel_snapshot_postcard.xml (limited to 'indra/newview/skins/default/xui/en') diff --git a/indra/newview/skins/default/xui/en/floater_snapshot.xml b/indra/newview/skins/default/xui/en/floater_snapshot.xml index 514fb058b9..76adaad57c 100755 --- a/indra/newview/skins/default/xui/en/floater_snapshot.xml +++ b/indra/newview/skins/default/xui/en/floater_snapshot.xml @@ -266,6 +266,12 @@ layout="topleft" name="panel_snapshot_profile" filename="panel_snapshot_profile.xml" /> + + \ No newline at end of file diff --git a/indra/newview/skins/default/xui/en/panel_snapshot_postcard.xml b/indra/newview/skins/default/xui/en/panel_snapshot_postcard.xml new file mode 100644 index 0000000000..975b08be05 --- /dev/null +++ b/indra/newview/skins/default/xui/en/panel_snapshot_postcard.xml @@ -0,0 +1,103 @@ + + + + Postcard from [SECOND_LIFE]. + + + Check this out! + + + Sending... + + + + E-mail + + + + + + + + + \ No newline at end of file -- cgit v1.2.3 From dad6f5d29f09955ad3fef243d52de9636a03fb53 Mon Sep 17 00:00:00 2001 From: Merov Linden Date: Fri, 15 May 2015 21:28:05 -0700 Subject: DD-370: Fix tooltip on Drag and Drop --- indra/newview/skins/default/xui/en/strings.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra/newview/skins/default/xui/en') diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml index b2a5b01255..d54aabc829 100755 --- a/indra/newview/skins/default/xui/en/strings.xml +++ b/indra/newview/skins/default/xui/en/strings.xml @@ -242,7 +242,7 @@ Please try logging in again in a minute. Subfolder count exceeds [AMOUNT]. Decrease the number of folders in your listing; box items if necessary. Item count exceeds [AMOUNT]. In order to sell more than [AMOUNT] items in one listing, you must box some of them. Stock items count exceeds [AMOUNT]. - You can only drop items or folders in the ALL tab. Please select that tab and move your item(s) or folder(s) again. + You can only drop items or folders in the ALL or UNASSOCIATED tabs. Please select one of those tabs and move your item(s) or folder(s) again. One or more of these objects cannot be sold or transferred You can only put items from your inventory on the marketplace You can't put linked items or folders on the marketplace -- cgit v1.2.3 From 1845816aa2419353ace258b7cfe24bdd08357ebe Mon Sep 17 00:00:00 2001 From: andreykproductengine Date: Thu, 25 Jun 2015 16:36:38 +0300 Subject: MAINT-5299 FIXED [MAINT-RC] Unlinking individual prims from a linkset no longer works --- indra/newview/skins/default/xui/en/notifications.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra/newview/skins/default/xui/en') diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml index ba8502ba81..93469aa3f4 100755 --- a/indra/newview/skins/default/xui/en/notifications.xml +++ b/indra/newview/skins/default/xui/en/notifications.xml @@ -5382,7 +5382,7 @@ You cannot undo this action. name="ConfirmUnlink" type="alertmodal"> - This is a large linkset. If you unlink it, you may not be able to link it again. You may wish to take a copy of the linkset into your inventory as a precaution. + This is a large selection with linksets. If you unlink it, you may not be able to link it again. You may wish to take copies of linksets into your inventory as a precaution. confirm Date: Tue, 9 Jun 2015 19:44:03 -0700 Subject: DD-412 : WIP : Validate a listing before creating a listing on SLM --- indra/newview/skins/default/xui/en/notifications.xml | 12 ++++++++++++ 1 file changed, 12 insertions(+) (limited to 'indra/newview/skins/default/xui/en') diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml index 398a06726c..5fc23b6d4b 100755 --- a/indra/newview/skins/default/xui/en/notifications.xml +++ b/indra/newview/skins/default/xui/en/notifications.xml @@ -386,6 +386,18 @@ Initialization with the Marketplace failed because of a system or network error. yestext="OK"/> + + In order to create your listing, we fixed the hierarchy of your listing contents. + confirm + + + Date: Tue, 9 Jun 2015 23:00:14 -0700 Subject: DD-412 : Fixes the hierarchy before creating a listing and warn the user --- indra/newview/skins/default/xui/en/notifications.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra/newview/skins/default/xui/en') diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml index 5fc23b6d4b..03f7de34ed 100755 --- a/indra/newview/skins/default/xui/en/notifications.xml +++ b/indra/newview/skins/default/xui/en/notifications.xml @@ -393,7 +393,7 @@ Initialization with the Marketplace failed because of a system or network error. In order to create your listing, we fixed the hierarchy of your listing contents. confirm -- cgit v1.2.3 From ab73b1af8fad5f012f782632a08740b4a0a1c8fa Mon Sep 17 00:00:00 2001 From: Merov Linden Date: Wed, 10 Jun 2015 14:53:12 -0700 Subject: DD-416 : Added DAMA when version folder is empty and unlisted, accelerated some functions avoiding depth computation when we could, fixed cut case --- indra/newview/skins/default/xui/en/notifications.xml | 12 ++++++++++++ 1 file changed, 12 insertions(+) (limited to 'indra/newview/skins/default/xui/en') diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml index 03f7de34ed..eb5dfdaf30 100755 --- a/indra/newview/skins/default/xui/en/notifications.xml +++ b/indra/newview/skins/default/xui/en/notifications.xml @@ -540,6 +540,18 @@ This listing could not be updated. yestext="OK"/> + + We have unlisted your listing because the version folder is empty. You need to add items to the version folder to list the listing again. + confirm + + + Date: Wed, 15 Jul 2015 15:13:25 -0400 Subject: fixes from code review by Ansariel --- indra/newview/skins/default/xui/en/strings.xml | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'indra/newview/skins/default/xui/en') diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml index eb28d16bfd..905f16f46d 100755 --- a/indra/newview/skins/default/xui/en/strings.xml +++ b/indra/newview/skins/default/xui/en/strings.xml @@ -495,7 +495,7 @@ Please try logging in again in a minute. Not Connected (You) - + Join An Experience Suppress alerts when managing estate access lists Replace your default animations Return objects on your behalf @@ -526,6 +526,8 @@ Please try logging in again in a minute. Load Targa Images Bitmap Images + PNG Images + Targa or PNG Images AVI Movie File XAF Anim File XML File @@ -2533,8 +2535,8 @@ This feature is currently in Beta. Please add your name to this [http://goo.gl/f Problem downloading Insufficient permissions to download a script. Insufficient permissions for - Unknown failure to download - Skipping script [SCRIPT] with Experience [EXPERIENCE]. + Unknown failure to download + Skipping script [SCRIPT] with Experience [EXPERIENCE]. Recompilation Progress recompile Reset Progress -- cgit v1.2.3 From 4ac031a899383cd61f318e86d09816078b75c2fe Mon Sep 17 00:00:00 2001 From: Oz Linden Date: Wed, 15 Jul 2015 16:06:07 -0400 Subject: more fixes from code review by Ansariel --- indra/newview/skins/default/xui/en/strings.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra/newview/skins/default/xui/en') diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml index 905f16f46d..5f6e90b47f 100755 --- a/indra/newview/skins/default/xui/en/strings.xml +++ b/indra/newview/skins/default/xui/en/strings.xml @@ -495,7 +495,7 @@ Please try logging in again in a minute. Not Connected (You) - Join An Experience + Suppress alerts when managing estate access lists Replace your default animations Return objects on your behalf -- cgit v1.2.3