From a030b30d34ef3152791b123c4f52d4086f3eb549 Mon Sep 17 00:00:00 2001
From: Merov Linden <merov@lindenlab.com>
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 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<floater
+    positioning="cascading"
+    can_close="true"
+    can_resize="true"
+    height="440"
+    help_topic="floater_merchant_items"
+    min_width="300"
+    min_height="200"
+    name="floater_merchant_items"
+    save_rect="true"
+    save_visibility="false"
+    reuse_instance="true"
+    title="MERCHANT ITEMS"
+    width="333">
+  <panel
+      follows="all"
+      layout="topleft"
+      left="0"
+      top="0"
+      label=""
+      height="440"
+      width="333">
+    <panel
+        follows="all"
+        left="10"
+        bottom="370"
+        width="313"
+        top="0"
+        bg_opaque_color="InventoryBackgroundColor">
+        <panel
+            name="merchant_items_inventory_placeholder_panel"
+            follows="all"
+            layout="topleft"
+            top="0"
+            left="0"
+            width="308"
+            height="370"
+            bg_opaque_color="InventoryBackgroundColor">
+            <text
+                name="merchant_items_inventory_placeholder_title"
+                type="string"
+                follows="top|left|right"
+                layout="topleft"
+                top="10"
+                left="0"
+                width="308"
+                height="25"
+                wrap="true"
+                halign="center"
+                font="SansSerifBold">
+                Loading...
+            </text>
+            <text
+            name="merchant_items_inventory_placeholder_text"
+            type="string"
+            follows="top|left|right"
+            layout="topleft"
+            top="35"
+            left="0"
+            width="308"
+            height="130"
+            wrap="true"
+            halign="left" />
+        </panel>
+    </panel>
+    <panel
+        follows="bottom|left|right"
+        left="10"
+        bottom="435"
+        width="313"
+        top="370">
+      <panel
+          name="merchant_items_generic_drag_target"
+          mouse_opaque="false"
+          follows="all"
+          top="5"
+          left="5"
+          width="303"
+          height="25"
+          background_visible="false"
+          bg_alpha_color="EmphasisColor_35"
+          border="true"
+          bevel_style="in"
+          visible="true">
+        <text
+            type="string"
+            follows="all"
+            layout="topleft"
+            top="6"
+            height="20"
+            left="5"
+            width="293"
+            halign="center"
+            font="SansSerifMedium"
+            font_shadow="hard"
+            valign="top">
+          Drag items you want to sell
+        </text>
+      </panel>
+    </panel>
+    <layout_stack name="import_progress_indicator" orientation="vertical" left="0" height="440" top="0" width="333" follows="all" visible="false">
+      <layout_panel />
+      <layout_panel height="24" auto_resize="false">
+        <layout_stack orientation="horizontal" left="0" height="24" top="0" width="333" follows="all">
+          <layout_panel width="0" />
+          <layout_panel width="24" auto_resize="false">
+            <loading_indicator
+                height="24"
+                layout="topleft"
+                left="0"
+                top="0"
+                width="24" />
+          </layout_panel>
+          <layout_panel width="0" />
+        </layout_stack>
+      </layout_panel>
+      <layout_panel />
+    </layout_stack>
+  </panel>
+</floater>
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" />
       </menu_item_call>
+        <menu_item_call
+            label="Merchant Items..."
+            name="MerchantItems">
+            <menu_item_call.on_click
+            function="Floater.ToggleOrBringToFront"
+            parameter="merchant_items" />
+        </menu_item_call>
       <menu_item_call
            label="Account dashboard..."
            name="Manage My Account">
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 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<inventory_panel
+    name="inventory_merchant_items"
+    start_folder.name="Merchant items"
+    show_empty_message="false"
+    show_load_status="false"
+    start_folder.type="merchant"
+    follows="all" layout="topleft"
+    top="0" left="0" height="165" width="308"
+    top_pad="0"
+    bg_opaque_color="DkGray2"
+    bg_alpha_color="DkGray2"
+    background_visible="true"
+    border="false"
+    bevel_style="none"
+    show_item_link_overlays="true"
+    tool_tip="Drag and drop items here to sell them"
+    scroll.reserve_scroll_corner="false">
+      <folder folder_arrow_image="Folder_Arrow"
+              folder_indentation="8"
+              item_height="20"
+              item_top_pad="4"
+              selection_image="Rounded_Square"
+              left_pad="5"
+              icon_pad="2"
+              icon_width="16"
+              text_pad="1"
+              text_pad_right="4"
+              arrow_size="12"
+              max_folder_item_overlap="2"/>
+      <item allow_open="false"/>
+</inventory_panel>
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
 	<string name="InventoryOutboxError">
 The [[MARKETPLACE_CREATE_STORE_URL] Marketplace store] is returning errors.
 	</string>
+	<string name="InventoryMerchantItemsNoItemsTitle">Your Merchant Items folder is empty.</string>
+	<string name="InventoryMerchantItemsNoItemsTooltip"></string>
+	<string name="InventoryMerchantItemsNoItems">
+        Drag folders to this area to list them for sale on the [[MARKETPLACE_DASHBOARD_URL] Marketplace].
+	</string>
 
 	<string name="Marketplace Error None">No errors</string>
 	<string name="Marketplace Error Not Merchant">Error: Before sending items to the Marketplace you will need to set yourself up as a merchant (free of charge).</string>
-- 
cgit v1.2.3


From 705d4182c8a84728e7f00cf48110c8f9720e4c29 Mon Sep 17 00:00:00 2001
From: Merov Linden <merov@lindenlab.com>
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 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<floater
+    positioning="cascading"
+    can_close="true"
+    can_resize="true"
+    height="440"
+    help_topic="floater_marketplace_listings"
+    min_width="300"
+    min_height="200"
+    name="floater_marketplace_listings"
+    save_rect="true"
+    save_visibility="false"
+    reuse_instance="true"
+    title="MARKETPLACE LISTINGS"
+    width="333">
+  <panel
+      follows="all"
+      layout="topleft"
+      left="0"
+      top="0"
+      label=""
+      height="440"
+      width="333">
+    <panel
+        follows="all"
+        left="10"
+        bottom="370"
+        width="313"
+        top="0"
+        bg_opaque_color="InventoryBackgroundColor">
+        <panel
+            name="marketplace_listings_inventory_placeholder_panel"
+            follows="all"
+            layout="topleft"
+            top="0"
+            left="0"
+            width="308"
+            height="370"
+            bg_opaque_color="InventoryBackgroundColor">
+            <text
+                name="marketplace_listings_inventory_placeholder_title"
+                type="string"
+                follows="top|left|right"
+                layout="topleft"
+                top="10"
+                left="0"
+                width="308"
+                height="25"
+                wrap="true"
+                halign="center"
+                font="SansSerifBold">
+                Loading...
+            </text>
+            <text
+            name="marketplace_listings_inventory_placeholder_text"
+            type="string"
+            follows="top|left|right"
+            layout="topleft"
+            top="35"
+            left="0"
+            width="308"
+            height="130"
+            wrap="true"
+            halign="left" />
+        </panel>
+    </panel>
+    <panel
+        follows="bottom|left|right"
+        left="10"
+        bottom="435"
+        width="313"
+        top="370">
+      <panel
+          name="marketplace_listings_generic_drag_target"
+          mouse_opaque="false"
+          follows="all"
+          top="5"
+          left="5"
+          width="303"
+          height="25"
+          background_visible="false"
+          bg_alpha_color="EmphasisColor_35"
+          border="true"
+          bevel_style="in"
+          visible="true">
+        <text
+            type="string"
+            follows="all"
+            layout="topleft"
+            top="6"
+            height="20"
+            left="5"
+            width="293"
+            halign="center"
+            font="SansSerifMedium"
+            font_shadow="hard"
+            valign="top">
+          Drag items you want to sell
+        </text>
+      </panel>
+    </panel>
+    <layout_stack name="import_progress_indicator" orientation="vertical" left="0" height="440" top="0" width="333" follows="all" visible="false">
+      <layout_panel />
+      <layout_panel height="24" auto_resize="false">
+        <layout_stack orientation="horizontal" left="0" height="24" top="0" width="333" follows="all">
+          <layout_panel width="0" />
+          <layout_panel width="24" auto_resize="false">
+            <loading_indicator
+                height="24"
+                layout="topleft"
+                left="0"
+                top="0"
+                width="24" />
+          </layout_panel>
+          <layout_panel width="0" />
+        </layout_stack>
+      </layout_panel>
+      <layout_panel />
+    </layout_stack>
+  </panel>
+</floater>
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 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<floater
-    positioning="cascading"
-    can_close="true"
-    can_resize="true"
-    height="440"
-    help_topic="floater_merchant_items"
-    min_width="300"
-    min_height="200"
-    name="floater_merchant_items"
-    save_rect="true"
-    save_visibility="false"
-    reuse_instance="true"
-    title="MERCHANT ITEMS"
-    width="333">
-  <panel
-      follows="all"
-      layout="topleft"
-      left="0"
-      top="0"
-      label=""
-      height="440"
-      width="333">
-    <panel
-        follows="all"
-        left="10"
-        bottom="370"
-        width="313"
-        top="0"
-        bg_opaque_color="InventoryBackgroundColor">
-        <panel
-            name="merchant_items_inventory_placeholder_panel"
-            follows="all"
-            layout="topleft"
-            top="0"
-            left="0"
-            width="308"
-            height="370"
-            bg_opaque_color="InventoryBackgroundColor">
-            <text
-                name="merchant_items_inventory_placeholder_title"
-                type="string"
-                follows="top|left|right"
-                layout="topleft"
-                top="10"
-                left="0"
-                width="308"
-                height="25"
-                wrap="true"
-                halign="center"
-                font="SansSerifBold">
-                Loading...
-            </text>
-            <text
-            name="merchant_items_inventory_placeholder_text"
-            type="string"
-            follows="top|left|right"
-            layout="topleft"
-            top="35"
-            left="0"
-            width="308"
-            height="130"
-            wrap="true"
-            halign="left" />
-        </panel>
-    </panel>
-    <panel
-        follows="bottom|left|right"
-        left="10"
-        bottom="435"
-        width="313"
-        top="370">
-      <panel
-          name="merchant_items_generic_drag_target"
-          mouse_opaque="false"
-          follows="all"
-          top="5"
-          left="5"
-          width="303"
-          height="25"
-          background_visible="false"
-          bg_alpha_color="EmphasisColor_35"
-          border="true"
-          bevel_style="in"
-          visible="true">
-        <text
-            type="string"
-            follows="all"
-            layout="topleft"
-            top="6"
-            height="20"
-            left="5"
-            width="293"
-            halign="center"
-            font="SansSerifMedium"
-            font_shadow="hard"
-            valign="top">
-          Drag items you want to sell
-        </text>
-      </panel>
-    </panel>
-    <layout_stack name="import_progress_indicator" orientation="vertical" left="0" height="440" top="0" width="333" follows="all" visible="false">
-      <layout_panel />
-      <layout_panel height="24" auto_resize="false">
-        <layout_stack orientation="horizontal" left="0" height="24" top="0" width="333" follows="all">
-          <layout_panel width="0" />
-          <layout_panel width="24" auto_resize="false">
-            <loading_indicator
-                height="24"
-                layout="topleft"
-                left="0"
-                top="0"
-                width="24" />
-          </layout_panel>
-          <layout_panel width="0" />
-        </layout_stack>
-      </layout_panel>
-      <layout_panel />
-    </layout_stack>
-  </panel>
-</floater>
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" />
       </menu_item_call>
         <menu_item_call
-            label="Merchant Items..."
-            name="MerchantItems">
+            label="Marketplace listings..."
+            name="MarketplaceListings">
             <menu_item_call.on_click
             function="Floater.ToggleOrBringToFront"
-            parameter="merchant_items" />
+            parameter="marketplace_listings" />
         </menu_item_call>
       <menu_item_call
            label="Account dashboard..."
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
new file mode 100755
index 0000000000..dcb634fe59
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/panel_marketplace_listings_inventory.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<inventory_panel
+    name="inventory_marketplace_listings"
+    start_folder.name="Marketplace listings"
+    show_empty_message="false"
+    show_load_status="false"
+    start_folder.type="merchant"
+    follows="all" layout="topleft"
+    top="0" left="0" height="165" width="308"
+    top_pad="0"
+    bg_opaque_color="DkGray2"
+    bg_alpha_color="DkGray2"
+    background_visible="true"
+    border="false"
+    bevel_style="none"
+    show_item_link_overlays="true"
+    tool_tip="Drag and drop items here to sell them"
+    scroll.reserve_scroll_corner="false">
+      <folder folder_arrow_image="Folder_Arrow"
+              folder_indentation="8"
+              item_height="20"
+              item_top_pad="4"
+              selection_image="Rounded_Square"
+              left_pad="5"
+              icon_pad="2"
+              icon_width="16"
+              text_pad="1"
+              text_pad_right="4"
+              arrow_size="12"
+              max_folder_item_overlap="2"/>
+      <item allow_open="false"/>
+</inventory_panel>
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 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<inventory_panel
-    name="inventory_merchant_items"
-    start_folder.name="Merchant items"
-    show_empty_message="false"
-    show_load_status="false"
-    start_folder.type="merchant"
-    follows="all" layout="topleft"
-    top="0" left="0" height="165" width="308"
-    top_pad="0"
-    bg_opaque_color="DkGray2"
-    bg_alpha_color="DkGray2"
-    background_visible="true"
-    border="false"
-    bevel_style="none"
-    show_item_link_overlays="true"
-    tool_tip="Drag and drop items here to sell them"
-    scroll.reserve_scroll_corner="false">
-      <folder folder_arrow_image="Folder_Arrow"
-              folder_indentation="8"
-              item_height="20"
-              item_top_pad="4"
-              selection_image="Rounded_Square"
-              left_pad="5"
-              icon_pad="2"
-              icon_width="16"
-              text_pad="1"
-              text_pad_right="4"
-              arrow_size="12"
-              max_folder_item_overlap="2"/>
-      <item allow_open="false"/>
-</inventory_panel>
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
 	<string name="InventoryOutboxError">
 The [[MARKETPLACE_CREATE_STORE_URL] Marketplace store] is returning errors.
 	</string>
-	<string name="InventoryMerchantItemsNoItemsTitle">Your Merchant Items folder is empty.</string>
-	<string name="InventoryMerchantItemsNoItemsTooltip"></string>
-	<string name="InventoryMerchantItemsNoItems">
+	<string name="InventoryMarketplaceListingsNoItemsTitle">Your Marketplace Listings folder is empty.</string>
+	<string name="InventoryMarketplaceListingsNoItemsTooltip"></string>
+	<string name="InventoryMarketplaceListingsNoItems">
         Drag folders to this area to list them for sale on the [[MARKETPLACE_DASHBOARD_URL] Marketplace].
 	</string>
 
-- 
cgit v1.2.3


From 68dbb5692f11eed39175ebf3313d96b5430231f9 Mon Sep 17 00:00:00 2001
From: Merov Linden <merov@lindenlab.com>
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.
 	<string name="Marketplace Error Unsellable Item">Error: This item can not be sold on the marketplace.</string>
 	<string name="Marketplace Error Internal Import">Error: There was a problem with this item.  Try again later.</string>
 
+	<string name="MarketplaceNoID">no Mkt ID</string>
+	<string name="MarketplaceActive">live</string>
+
 	<string name="Open landmarks">Open landmarks</string>
 
 	<!-- use value="" because they have preceding spaces -->
-- 
cgit v1.2.3


From 28fe8352549c0fd99da0c3f0119d96386e52a703 Mon Sep 17 00:00:00 2001
From: Merov Linden <merov@lindenlab.com>
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">
+    <string name="MarketplaceListingsInitializing">Initializing...</string>
   <panel
       follows="all"
       layout="topleft"
@@ -98,8 +99,21 @@
           Drag items you want to sell
         </text>
       </panel>
+        <text
+        name="marketplace_status"
+        type="string"
+        follows="all"
+        layout="topleft"
+        top="40"
+        left="5"
+        width="150"
+        height="20"
+        wrap="true"
+        halign="left"
+        valign="center"
+        font="SansSerif"/>
     </panel>
-    <layout_stack name="import_progress_indicator" orientation="vertical" left="0" height="440" top="0" width="333" follows="all" visible="false">
+    <layout_stack name="initialization_progress_indicator" orientation="vertical" left="0" height="440" top="0" width="333" follows="all" visible="false">
       <layout_panel />
       <layout_panel height="24" auto_resize="false">
         <layout_stack orientation="horizontal" left="0" height="24" top="0" width="333" follows="all">
-- 
cgit v1.2.3


From e08296f6dc44c1b18b1ca36a0ee7dc2f8578d84b Mon Sep 17 00:00:00 2001
From: Merov Linden <merov@lindenlab.com>
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 @@
         </panel>
     </panel>
     <panel
-        follows="bottom|left|right"
-        left="10"
-        bottom="435"
-        width="313"
-        top="370">
-      <panel
-          name="marketplace_listings_generic_drag_target"
-          mouse_opaque="false"
-          follows="all"
-          top="5"
-          left="5"
-          width="303"
-          height="25"
-          background_visible="false"
-          bg_alpha_color="EmphasisColor_35"
-          border="true"
-          bevel_style="in"
-          visible="true">
-        <text
-            type="string"
-            follows="all"
-            layout="topleft"
-            top="6"
-            height="20"
-            left="5"
-            width="293"
-            halign="center"
-            font="SansSerifMedium"
-            font_shadow="hard"
-            valign="top">
-          Drag items you want to sell
-        </text>
-      </panel>
-        <text
+      follows="bottom|left|right"
+      left="10"
+      bottom="435"
+      width="313"
+      top="370">
+      <text
         name="marketplace_status"
         type="string"
         follows="all"
-- 
cgit v1.2.3


From d9747b3f828000d46a09a881fae2ab915cee5f4e Mon Sep 17 00:00:00 2001
From: Merov Linden <merov@lindenlab.com>
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 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<inventory_panel
-    name="inventory_marketplace_listings"
-    start_folder.name="Marketplace listings"
-    show_empty_message="false"
-    show_load_status="false"
-    start_folder.type="merchant"
-    follows="all" layout="topleft"
-    top="0" left="0" height="165" width="308"
-    top_pad="0"
-    bg_opaque_color="DkGray2"
-    bg_alpha_color="DkGray2"
-    background_visible="true"
-    border="false"
-    bevel_style="none"
-    show_item_link_overlays="true"
-    tool_tip="Drag and drop items here to sell them"
-    scroll.reserve_scroll_corner="false">
-      <folder folder_arrow_image="Folder_Arrow"
-              folder_indentation="8"
-              item_height="20"
-              item_top_pad="4"
-              selection_image="Rounded_Square"
-              left_pad="5"
-              icon_pad="2"
-              icon_width="16"
-              text_pad="1"
-              text_pad_right="4"
-              arrow_size="12"
-              max_folder_item_overlap="2"/>
-      <item allow_open="false"/>
-</inventory_panel>
+<panel
+    default_tab_group="1"
+    follows="all"
+    label="Marketplace"
+    layout="topleft"
+    height="370"
+    width="308"
+    name="main marketplace panel">
+    <tab_container
+        follows="all"
+        halign="center"
+        height="370"
+        layout="topleft"
+        top="0"
+        left="0"
+        name="inventory filter tabs"
+        tab_height="30"
+        tab_group="1"
+        tab_position="top"
+        tab_min_width="100"
+        top_pad="0"
+        width="308">
+        <inventory_panel
+        label="ALL"
+        name="All Items"
+        start_folder.name="Marketplace listings"
+        show_empty_message="false"
+        show_load_status="false"
+        start_folder.type="merchant"
+        tool_tip="Drag and drop items here to sell them"
+        bg_opaque_color="DkGray2"
+        bg_alpha_color="DkGray2"
+        background_visible="true"
+        border="false"
+        bevel_style="none"
+        follows="all"
+        height="340"
+        help_topic="marketplace_tab"
+        layout="topleft"
+        left="0"
+        sort_order_setting="InventorySortOrder"
+        show_item_link_overlays="true"
+        top="16"
+        width="308">
+            <folder folder_arrow_image="Folder_Arrow"
+            folder_indentation="8"
+            item_height="20"
+            item_top_pad="4"
+            selection_image="Rounded_Square"
+            left_pad="5"
+            icon_pad="2"
+            icon_width="16"
+            text_pad="1"
+            text_pad_right="4"
+            arrow_size="12"
+            max_folder_item_overlap="2"/>
+            <item allow_open="false"/>
+        </inventory_panel>
+        <inventory_panel
+        label="ACTIVE"
+        name="Active Items"
+        start_folder.name="Marketplace listings"
+        show_empty_message="false"
+        show_load_status="false"
+        start_folder.type="merchant"
+        bg_opaque_color="DkGray2"
+        bg_alpha_color="DkGray2"
+        background_visible="true"
+        border="false"
+        bevel_style="none"
+        follows="all"
+        height="340"
+        help_topic="marketplace_tab"
+        layout="topleft"
+        left_delta="0"
+        show_item_link_overlays="true"
+        width="308">
+        </inventory_panel>
+        <inventory_panel
+            label="INACTIVE"
+            name="Inactive Items"
+            start_folder.name="Marketplace listings"
+            show_empty_message="false"
+            show_load_status="false"
+            start_folder.type="merchant"
+            bg_opaque_color="DkGray2"
+            bg_alpha_color="DkGray2"
+            background_visible="true"
+            border="false"
+            bevel_style="none"
+            follows="all"
+            height="340"
+            help_topic="marketplace_tab"
+            layout="topleft"
+            left_delta="0"
+            show_item_link_overlays="true"
+            width="308">
+        </inventory_panel>
+        <inventory_panel
+            label="UNASSOCIATED"
+            name="Unassociated Items"
+            start_folder.name="Marketplace listings"
+            show_empty_message="false"
+            show_load_status="false"
+            start_folder.type="merchant"
+            bg_opaque_color="DkGray2"
+            bg_alpha_color="DkGray2"
+            background_visible="true"
+            border="false"
+            bevel_style="none"
+            follows="all"
+            height="340"
+            help_topic="marketplace_tab"
+            layout="topleft"
+            left_delta="0"
+            show_item_link_overlays="true"
+            width="308">
+        </inventory_panel>
+    </tab_container>
+</panel>
\ No newline at end of file
-- 
cgit v1.2.3


From 15c0907942ae2e82876d4aaf25ab342da0bcf61e Mon Sep 17 00:00:00 2001
From: Merov Linden <merov@lindenlab.com>
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 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <floater
-    positioning="cascading"
-    can_close="true"
-    can_resize="true"
+  title="MARKETPLACE LISTINGS"
+  name="floater_marketplace_listings"
+  help_topic="floater_marketplace_listings"
+  positioning="cascading"
+  width="333"
+  height="445"
+  min_width="200"
+  min_height="300"
+  can_close="true"
+  can_resize="true"
+  save_rect="true"
+  save_visibility="false"
+  reuse_instance="true">
+  <string name="MarketplaceListingsInitializing">Initializing...</string>
+  <panel
+    follows="all"
+    layout="topleft"
+    left="0"
+    top="0"
+    label=""
     height="440"
-    help_topic="floater_marketplace_listings"
-    min_width="300"
-    min_height="200"
-    name="floater_marketplace_listings"
-    save_rect="true"
-    save_visibility="false"
-    reuse_instance="true"
-    title="MARKETPLACE LISTINGS"
     width="333">
-    <string name="MarketplaceListingsInitializing">Initializing...</string>
-  <panel
+    <panel
       follows="all"
-      layout="topleft"
-      left="0"
+      left="10"
+      height="420"
+      width="313"
       top="0"
-      label=""
-      height="440"
-      width="333">
-    <panel
+      bg_opaque_color="InventoryBackgroundColor">
+      <panel
+        name="marketplace_listings_inventory_placeholder_panel"
         follows="all"
-        left="10"
-        bottom="370"
-        width="313"
+        layout="topleft"
         top="0"
+        left="0"
+        width="313"
+        height="420"
         bg_opaque_color="InventoryBackgroundColor">
-        <panel
-            name="marketplace_listings_inventory_placeholder_panel"
-            follows="all"
-            layout="topleft"
-            top="0"
-            left="0"
-            width="308"
-            height="370"
-            bg_opaque_color="InventoryBackgroundColor">
-            <text
-                name="marketplace_listings_inventory_placeholder_title"
-                type="string"
-                follows="top|left|right"
-                layout="topleft"
-                top="10"
-                left="0"
-                width="308"
-                height="25"
-                wrap="true"
-                halign="center"
-                font="SansSerifBold">
-                Loading...
-            </text>
-            <text
-            name="marketplace_listings_inventory_placeholder_text"
-            type="string"
-            follows="top|left|right"
-            layout="topleft"
-            top="35"
-            left="0"
-            width="308"
-            height="130"
-            wrap="true"
-            halign="left" />
-        </panel>
+        <text
+          name="marketplace_listings_inventory_placeholder_title"
+          type="string"
+          follows="top|left|right"
+          layout="topleft"
+          top="10"
+          left="0"
+          width="313"
+          height="25"
+          wrap="true"
+          halign="center"
+          font="SansSerifBold">
+            Loading...
+        </text>
+        <text
+          name="marketplace_listings_inventory_placeholder_text"
+          type="string"
+          follows="top|left|right"
+          layout="topleft"
+          top="35"
+          left="0"
+          width="313"
+          height="130"
+          wrap="true"
+          halign="left" />
+      </panel>
     </panel>
     <panel
       follows="bottom|left|right"
+      layout="topleft"
       left="10"
-      bottom="435"
       width="313"
-      top="370">
+      height="20">
       <text
         name="marketplace_status"
         type="string"
-        follows="all"
+        follows="bottom|left|right"
         layout="topleft"
-        top="40"
+        top="0"
         left="5"
         width="150"
         height="20"
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 33ac08d87f..4947cb57a2 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
@@ -18,7 +18,7 @@
         tab_height="30"
         tab_group="1"
         tab_position="top"
-        tab_min_width="100"
+        tab_min_width="50"
         top_pad="0"
         width="308">
         <inventory_panel
-- 
cgit v1.2.3


From b502e596af25b5f6f93e766b473a1ee2eed0b3ec Mon Sep 17 00:00:00 2001
From: Merov Linden <merov@lindenlab.com>
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 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <panel
+  label="Marketplace"
+  name="main marketplace panel"
+  follows="all"
+  layout="topleft"
+  width="308"
+  height="375">
+  <panel
+    label="tool_panel"
+    name="nearby_buttons_panel"
+    follows="left|top|right"
+    layout="topleft"
+    height="30"
+    width="308"
+    top="0"
+    left="0">
+    <menu_button
+      name="sort_btn"
+      tool_tip="View/sort options"
+      layout="topleft"
+      follows="top|left"
+      width="31"
+      height="25"
+      left="2"
+      menu_filename="menu_people_nearby_view.xml"
+      image_hover_unselected="Toolbar_Middle_Over"
+      image_overlay="Conv_toolbar_sort"
+      image_selected="Toolbar_Middle_Selected"
+      image_unselected="Toolbar_Middle_Off"
+      menu_position="bottomleft"/>
+  </panel>
+  <panel
+    follows="all"
+    layout="topleft"
     default_tab_group="1"
+    width="308"
+    height="340">
+  <tab_container
+    name="inventory filter tabs"
     follows="all"
-    label="Marketplace"
     layout="topleft"
-    height="370"
+    top="0"
+    left="0"
+    top_pad="0"
     width="308"
-    name="main marketplace panel">
-    <tab_container
-        follows="all"
-        halign="center"
-        height="370"
-        layout="topleft"
-        top="0"
-        left="0"
-        name="inventory filter tabs"
-        tab_height="30"
-        tab_group="1"
-        tab_position="top"
-        tab_min_width="50"
-        top_pad="0"
-        width="308">
-        <inventory_panel
-        label="ALL"
-        name="All Items"
-        start_folder.name="Marketplace listings"
-        show_empty_message="false"
-        show_load_status="false"
-        start_folder.type="merchant"
-        tool_tip="Drag and drop items here to sell them"
-        bg_opaque_color="DkGray2"
-        bg_alpha_color="DkGray2"
-        background_visible="true"
-        border="false"
-        bevel_style="none"
-        follows="all"
-        height="340"
-        help_topic="marketplace_tab"
-        layout="topleft"
-        left="0"
-        sort_order_setting="InventorySortOrder"
-        show_item_link_overlays="true"
-        top="16"
-        width="308">
-            <folder folder_arrow_image="Folder_Arrow"
-            folder_indentation="8"
-            item_height="20"
-            item_top_pad="4"
-            selection_image="Rounded_Square"
-            left_pad="5"
-            icon_pad="2"
-            icon_width="16"
-            text_pad="1"
-            text_pad_right="4"
-            arrow_size="12"
-            max_folder_item_overlap="2"/>
-            <item allow_open="false"/>
-        </inventory_panel>
-        <inventory_panel
-        label="ACTIVE"
-        name="Active Items"
-        start_folder.name="Marketplace listings"
-        show_empty_message="false"
-        show_load_status="false"
-        start_folder.type="merchant"
-        bg_opaque_color="DkGray2"
-        bg_alpha_color="DkGray2"
-        background_visible="true"
-        border="false"
-        bevel_style="none"
-        follows="all"
-        height="340"
-        help_topic="marketplace_tab"
-        layout="topleft"
-        left_delta="0"
-        show_item_link_overlays="true"
-        width="308">
-        </inventory_panel>
-        <inventory_panel
-            label="INACTIVE"
-            name="Inactive Items"
-            start_folder.name="Marketplace listings"
-            show_empty_message="false"
-            show_load_status="false"
-            start_folder.type="merchant"
-            bg_opaque_color="DkGray2"
-            bg_alpha_color="DkGray2"
-            background_visible="true"
-            border="false"
-            bevel_style="none"
-            follows="all"
-            height="340"
-            help_topic="marketplace_tab"
-            layout="topleft"
-            left_delta="0"
-            show_item_link_overlays="true"
-            width="308">
-        </inventory_panel>
-        <inventory_panel
-            label="UNASSOCIATED"
-            name="Unassociated Items"
-            start_folder.name="Marketplace listings"
-            show_empty_message="false"
-            show_load_status="false"
-            start_folder.type="merchant"
-            bg_opaque_color="DkGray2"
-            bg_alpha_color="DkGray2"
-            background_visible="true"
-            border="false"
-            bevel_style="none"
-            follows="all"
-            height="340"
-            help_topic="marketplace_tab"
-            layout="topleft"
-            left_delta="0"
-            show_item_link_overlays="true"
-            width="308">
-        </inventory_panel>
-    </tab_container>
+    height="340"
+    halign="center"
+    tab_height="30"
+    tab_group="1"
+    tab_position="top"
+    tab_min_width="50">
+    <inventory_panel
+      label="ALL"
+      name="All Items"
+      help_topic="marketplace_tab"
+      layout="topleft"
+      follows="all"
+      width="308"
+      height="310"
+      top="16"
+      left="0"
+      start_folder.name="Marketplace listings"
+      show_empty_message="false"
+      show_load_status="false"
+      start_folder.type="merchant"
+      tool_tip="Drag and drop items here to sell them"
+      bg_opaque_color="DkGray2"
+      bg_alpha_color="DkGray2"
+      background_visible="true"
+      border="false"
+      bevel_style="none"
+      sort_order_setting="InventorySortOrder"
+      show_item_link_overlays="true">
+    </inventory_panel>
+    <inventory_panel
+      label="ACTIVE"
+      name="Active Items"
+      help_topic="marketplace_tab"
+      layout="topleft"
+      follows="all"
+      width="308"
+      height="310"
+      left_delta="0"
+      start_folder.name="Marketplace listings"
+      show_empty_message="false"
+      show_load_status="false"
+      start_folder.type="merchant"
+      bg_opaque_color="DkGray2"
+      bg_alpha_color="DkGray2"
+      background_visible="true"
+      border="false"
+      bevel_style="none"
+      show_item_link_overlays="true">
+    </inventory_panel>
+    <inventory_panel
+      label="INACTIVE"
+      name="Inactive Items"
+      help_topic="marketplace_tab"
+      layout="topleft"
+      follows="all"
+      width="308"
+      height="310"
+      left_delta="0"
+      start_folder.name="Marketplace listings"
+      show_empty_message="false"
+      show_load_status="false"
+      start_folder.type="merchant"
+      bg_opaque_color="DkGray2"
+      bg_alpha_color="DkGray2"
+      background_visible="true"
+      border="false"
+      bevel_style="none"
+      show_item_link_overlays="true">
+    </inventory_panel>
+    <inventory_panel
+      label="UNASSOCIATED"
+      name="Unassociated Items"
+      help_topic="marketplace_tab"
+      layout="topleft"
+      follows="all"
+      width="308"
+      height="310"
+      left_delta="0"
+      start_folder.name="Marketplace listings"
+      show_empty_message="false"
+      show_load_status="false"
+      start_folder.type="merchant"
+      bg_opaque_color="DkGray2"
+      bg_alpha_color="DkGray2"
+      background_visible="true"
+      border="false"
+      bevel_style="none"
+      show_item_link_overlays="true">
+    </inventory_panel>
+  </tab_container>
+  </panel>
 </panel>
\ No newline at end of file
-- 
cgit v1.2.3


From 03622e0833fd2d2bdcc9ed3ed0c009ad9e9fee3e Mon Sep 17 00:00:00 2001
From: Merov Linden <merov@lindenlab.com>
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">
   <tab_container
-    name="inventory filter tabs"
+    name="marketplace filter tabs"
     follows="all"
     layout="topleft"
     top="0"
-- 
cgit v1.2.3


From d11a15b6dd0a6bb74b4f8f3f6ce23a05123c7e99 Mon Sep 17 00:00:00 2001
From: Merov Linden <merov@lindenlab.com>
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 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<toggleable_menu
+ name="menu_group_plus"
+ left="0" bottom="0" visible="false"
+ mouse_opaque="false">
+    <menu_item_check
+       label="Sort by stock amount (low to high)"
+       name="sort_by_stock_amount">
+      <menu_item_check.on_click
+         function="Marketplace.ViewSort.Action"
+       parameter="sort_by_stock_amount"/>
+      <menu_item_check.on_check
+         function="Marketplace.ViewSort.CheckItem"
+         parameter="sort_by_stock_amount"/>
+    </menu_item_check>
+    <menu_item_separator layout="topleft" />
+    <menu_item_check name="show_low_stock" label="Show Low Stock Listings Only">
+        <menu_item_check.on_click
+         function="Marketplace.ViewSort.Action"
+         parameter="show_low_stock" />
+        <menu_item_check.on_check
+         function="Marketplace.ViewSort.CheckItem"
+         parameter="show_low_stock" />
+    </menu_item_check>
+    <menu_item_check name="show_associated_listings" label="Show Associated Listings Only">
+        <menu_item_check.on_click
+        function="Marketplace.ViewSort.Action"
+        parameter="show_associated_listings" />
+        <menu_item_check.on_check
+        function="Marketplace.ViewSort.CheckItem"
+        parameter="show_associated_listings" />
+    </menu_item_check>
+    <menu_item_check name="show_non_associated_listings" label="Show Non Associated Listings Only">
+        <menu_item_check.on_click
+        function="Marketplace.ViewSort.Action"
+        parameter="show_non_associated_listings" />
+        <menu_item_check.on_check
+        function="Marketplace.ViewSort.CheckItem"
+        parameter="show_non_associated_listings" />
+    </menu_item_check>
+    <menu_item_check name="show_active" label="Show Active Listings and Folders Only">
+        <menu_item_check.on_click
+        function="Marketplace.ViewSort.Action"
+        parameter="show_active" />
+        <menu_item_check.on_check
+        function="Marketplace.ViewSort.CheckItem"
+        parameter="show_active" />
+    </menu_item_check>
+</toggleable_menu>
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 <merov@lindenlab.com>
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 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <toggleable_menu
- name="menu_group_plus"
+ name="menu_marketplace_sort"
  left="0" bottom="0" visible="false"
  mouse_opaque="false">
     <menu_item_check
@@ -14,13 +14,13 @@
          parameter="sort_by_stock_amount"/>
     </menu_item_check>
     <menu_item_separator layout="topleft" />
-    <menu_item_check name="show_low_stock" label="Show Low Stock Listings Only">
+    <menu_item_check name="show_all" label="Show All">
         <menu_item_check.on_click
-         function="Marketplace.ViewSort.Action"
-         parameter="show_low_stock" />
+        function="Marketplace.ViewSort.Action"
+        parameter="show_all" />
         <menu_item_check.on_check
-         function="Marketplace.ViewSort.CheckItem"
-         parameter="show_low_stock" />
+        function="Marketplace.ViewSort.CheckItem"
+        parameter="show_all" />
     </menu_item_check>
     <menu_item_check name="show_associated_listings" label="Show Associated Listings Only">
         <menu_item_check.on_click
@@ -30,20 +30,20 @@
         function="Marketplace.ViewSort.CheckItem"
         parameter="show_associated_listings" />
     </menu_item_check>
-    <menu_item_check name="show_non_associated_listings" label="Show Non Associated Listings Only">
+    <menu_item_check name="show_active" label="Show Active Listings and Folders Only">
         <menu_item_check.on_click
-        function="Marketplace.ViewSort.Action"
-        parameter="show_non_associated_listings" />
+        function="People.Nearby.ViewSort.Action"
+        parameter="show_active" />
         <menu_item_check.on_check
-        function="Marketplace.ViewSort.CheckItem"
-        parameter="show_non_associated_listings" />
+        function="People.Nearby.ViewSort.CheckItem"
+        parameter="show_active" />
     </menu_item_check>
-    <menu_item_check name="show_active" label="Show Active Listings and Folders Only">
+    <menu_item_check name="show_inactive_listings" label="Show Inactive Listings Only">
         <menu_item_check.on_click
         function="Marketplace.ViewSort.Action"
-        parameter="show_active" />
+        parameter="show_inactive_listings" />
         <menu_item_check.on_check
         function="Marketplace.ViewSort.CheckItem"
-        parameter="show_active" />
+        parameter="show_inactive_listings" />
     </menu_item_check>
 </toggleable_menu>
-- 
cgit v1.2.3


From f813a25224081e68d4772676909d2cff14407486 Mon Sep 17 00:00:00 2001
From: Merov Linden <merov@lindenlab.com>
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 @@
     </menu_item_check>
     <menu_item_check name="show_active" label="Show Active Listings and Folders Only">
         <menu_item_check.on_click
-        function="People.Nearby.ViewSort.Action"
+        function="Marketplace.ViewSort.Action"
         parameter="show_active" />
         <menu_item_check.on_check
-        function="People.Nearby.ViewSort.CheckItem"
+        function="Marketplace.ViewSort.CheckItem"
         parameter="show_active" />
     </menu_item_check>
     <menu_item_check name="show_inactive_listings" label="Show Inactive Listings Only">
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 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel
+  label="Marketplace"
+  name="main marketplace panel"
+  follows="all"
+  layout="topleft"
+  width="308"
+  height="375">
+  <panel
+    label="tool_panel"
+    name="nearby_buttons_panel"
+    follows="left|top|right"
+    layout="topleft"
+    height="30"
+    width="308"
+    top="0"
+    left="0">
+    <menu_button
+      name="sort_btn"
+      tool_tip="View/sort options"
+      layout="topleft"
+      follows="top|left"
+      width="31"
+      height="25"
+      left="2"
+      menu_filename="menu_marketplace_view.xml"
+      image_hover_unselected="Toolbar_Middle_Over"
+      image_overlay="Conv_toolbar_sort"
+      image_selected="Toolbar_Middle_Selected"
+      image_unselected="Toolbar_Middle_Off"
+      menu_position="bottomleft"/>
+  </panel>
+  <panel
+    follows="all"
+    layout="topleft"
+    default_tab_group="1"
+    width="308"
+    height="340">
+  <tab_container
+    name="marketplace filter tabs"
+    follows="all"
+    layout="topleft"
+    top="0"
+    left="0"
+    top_pad="0"
+    width="308"
+    height="340"
+    halign="center"
+    tab_height="30"
+    tab_group="1"
+    tab_position="top"
+    tab_min_width="50">
+    <inventory_panel
+      label="ALL"
+      name="All Items"
+      help_topic="marketplace_tab"
+      layout="topleft"
+      follows="all"
+      width="308"
+      height="310"
+      top="16"
+      left="0"
+      start_folder.name="Marketplace listings"
+      show_empty_message="false"
+      show_load_status="false"
+      start_folder.type="merchant"
+      tool_tip="Drag and drop items here to sell them"
+      bg_opaque_color="DkGray2"
+      bg_alpha_color="DkGray2"
+      background_visible="true"
+      border="false"
+      bevel_style="none"
+      sort_order_setting="InventorySortOrder"
+      show_item_link_overlays="true">
+    </inventory_panel>
+    <inventory_panel
+      label="ACTIVE"
+      name="Active Items"
+      help_topic="marketplace_tab"
+      layout="topleft"
+      follows="all"
+      width="308"
+      height="310"
+      left_delta="0"
+      start_folder.name="Marketplace listings"
+      show_empty_message="false"
+      show_load_status="false"
+      start_folder.type="merchant"
+      bg_opaque_color="DkGray2"
+      bg_alpha_color="DkGray2"
+      background_visible="true"
+      border="false"
+      bevel_style="none"
+      show_item_link_overlays="true">
+    </inventory_panel>
+    <inventory_panel
+      label="INACTIVE"
+      name="Inactive Items"
+      help_topic="marketplace_tab"
+      layout="topleft"
+      follows="all"
+      width="308"
+      height="310"
+      left_delta="0"
+      start_folder.name="Marketplace listings"
+      show_empty_message="false"
+      show_load_status="false"
+      start_folder.type="merchant"
+      bg_opaque_color="DkGray2"
+      bg_alpha_color="DkGray2"
+      background_visible="true"
+      border="false"
+      bevel_style="none"
+      show_item_link_overlays="true">
+    </inventory_panel>
+    <inventory_panel
+      label="UNASSOCIATED"
+      name="Unassociated Items"
+      help_topic="marketplace_tab"
+      layout="topleft"
+      follows="all"
+      width="308"
+      height="310"
+      left_delta="0"
+      start_folder.name="Marketplace listings"
+      show_empty_message="false"
+      show_load_status="false"
+      start_folder.type="merchant"
+      bg_opaque_color="DkGray2"
+      bg_alpha_color="DkGray2"
+      background_visible="true"
+      border="false"
+      bevel_style="none"
+      show_item_link_overlays="true">
+    </inventory_panel>
+  </tab_container>
+  </panel>
+</panel>
\ 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 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel
-  label="Marketplace"
-  name="main marketplace panel"
-  follows="all"
-  layout="topleft"
-  width="308"
-  height="375">
-  <panel
-    label="tool_panel"
-    name="nearby_buttons_panel"
-    follows="left|top|right"
-    layout="topleft"
-    height="30"
-    width="308"
-    top="0"
-    left="0">
-    <menu_button
-      name="sort_btn"
-      tool_tip="View/sort options"
-      layout="topleft"
-      follows="top|left"
-      width="31"
-      height="25"
-      left="2"
-      menu_filename="menu_marketplace_view.xml"
-      image_hover_unselected="Toolbar_Middle_Over"
-      image_overlay="Conv_toolbar_sort"
-      image_selected="Toolbar_Middle_Selected"
-      image_unselected="Toolbar_Middle_Off"
-      menu_position="bottomleft"/>
-  </panel>
-  <panel
-    follows="all"
-    layout="topleft"
-    default_tab_group="1"
-    width="308"
-    height="340">
-  <tab_container
-    name="marketplace filter tabs"
-    follows="all"
-    layout="topleft"
-    top="0"
-    left="0"
-    top_pad="0"
-    width="308"
-    height="340"
-    halign="center"
-    tab_height="30"
-    tab_group="1"
-    tab_position="top"
-    tab_min_width="50">
-    <inventory_panel
-      label="ALL"
-      name="All Items"
-      help_topic="marketplace_tab"
-      layout="topleft"
-      follows="all"
-      width="308"
-      height="310"
-      top="16"
-      left="0"
-      start_folder.name="Marketplace listings"
-      show_empty_message="false"
-      show_load_status="false"
-      start_folder.type="merchant"
-      tool_tip="Drag and drop items here to sell them"
-      bg_opaque_color="DkGray2"
-      bg_alpha_color="DkGray2"
-      background_visible="true"
-      border="false"
-      bevel_style="none"
-      sort_order_setting="InventorySortOrder"
-      show_item_link_overlays="true">
-    </inventory_panel>
-    <inventory_panel
-      label="ACTIVE"
-      name="Active Items"
-      help_topic="marketplace_tab"
-      layout="topleft"
-      follows="all"
-      width="308"
-      height="310"
-      left_delta="0"
-      start_folder.name="Marketplace listings"
-      show_empty_message="false"
-      show_load_status="false"
-      start_folder.type="merchant"
-      bg_opaque_color="DkGray2"
-      bg_alpha_color="DkGray2"
-      background_visible="true"
-      border="false"
-      bevel_style="none"
-      show_item_link_overlays="true">
-    </inventory_panel>
-    <inventory_panel
-      label="INACTIVE"
-      name="Inactive Items"
-      help_topic="marketplace_tab"
-      layout="topleft"
-      follows="all"
-      width="308"
-      height="310"
-      left_delta="0"
-      start_folder.name="Marketplace listings"
-      show_empty_message="false"
-      show_load_status="false"
-      start_folder.type="merchant"
-      bg_opaque_color="DkGray2"
-      bg_alpha_color="DkGray2"
-      background_visible="true"
-      border="false"
-      bevel_style="none"
-      show_item_link_overlays="true">
-    </inventory_panel>
-    <inventory_panel
-      label="UNASSOCIATED"
-      name="Unassociated Items"
-      help_topic="marketplace_tab"
-      layout="topleft"
-      follows="all"
-      width="308"
-      height="310"
-      left_delta="0"
-      start_folder.name="Marketplace listings"
-      show_empty_message="false"
-      show_load_status="false"
-      start_folder.type="merchant"
-      bg_opaque_color="DkGray2"
-      bg_alpha_color="DkGray2"
-      background_visible="true"
-      border="false"
-      bevel_style="none"
-      show_item_link_overlays="true">
-    </inventory_panel>
-  </tab_container>
-  </panel>
-</panel>
\ No newline at end of file
-- 
cgit v1.2.3


From 48b6a713be449f39b33b3de190b3caccd5ad55a2 Mon Sep 17 00:00:00 2001
From: Merov Linden <merov@lindenlab.com>
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" />
       </panel>
-    </panel>
+      <panel
+        name="panel_marketplace_listing"
+        filename="panel_marketplace_listings.xml"
+        class="llpanelmarketplacelistings"
+        top="0"
+        follows="all"/>
+      </panel>
     <panel
       follows="bottom|left|right"
       layout="topleft"
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 9ed93e2f11..4043c5c93d 100755
--- a/indra/newview/skins/default/xui/en/menu_marketplace_view.xml
+++ b/indra/newview/skins/default/xui/en/menu_marketplace_view.xml
@@ -22,13 +22,13 @@
         function="Marketplace.ViewSort.CheckItem"
         parameter="show_all" />
     </menu_item_check>
-    <menu_item_check name="show_associated_listings" label="Show Associated Listings Only">
+    <menu_item_check name="show_unassociated" label="Show Unassociated Listings Only">
         <menu_item_check.on_click
         function="Marketplace.ViewSort.Action"
-        parameter="show_associated_listings" />
+        parameter="show_unassociated" />
         <menu_item_check.on_check
         function="Marketplace.ViewSort.CheckItem"
-        parameter="show_associated_listings" />
+        parameter="show_unassociated" />
     </menu_item_check>
     <menu_item_check name="show_active" label="Show Active Listings and Folders Only">
         <menu_item_check.on_click
@@ -38,12 +38,12 @@
         function="Marketplace.ViewSort.CheckItem"
         parameter="show_active" />
     </menu_item_check>
-    <menu_item_check name="show_inactive_listings" label="Show Inactive Listings Only">
+    <menu_item_check name="show_inactive" label="Show Inactive Listings Only">
         <menu_item_check.on_click
         function="Marketplace.ViewSort.Action"
-        parameter="show_inactive_listings" />
+        parameter="show_inactive" />
         <menu_item_check.on_check
         function="Marketplace.ViewSort.CheckItem"
-        parameter="show_inactive_listings" />
+        parameter="show_inactive" />
     </menu_item_check>
 </toggleable_menu>
-- 
cgit v1.2.3


From 0ec8fbec6deaa24506391ef239c50009eebe1eef Mon Sep 17 00:00:00 2001
From: Merov Linden <merov@lindenlab.com>
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.
 
 	<string name="MarketplaceNoID">no Mkt ID</string>
 	<string name="MarketplaceActive">live</string>
+	<string name="MarketplaceStock">stock</string>
 
 	<string name="Open landmarks">Open landmarks</string>
 
-- 
cgit v1.2.3


From c36b7fa963511023866b6518f245d2c6edd1add0 Mon Sep 17 00:00:00 2001
From: Merov Linden <merov@lindenlab.com>
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">
   <string name="MarketplaceListingsInitializing">Initializing...</string>
   <panel
+    name="marketplace_listings_panel"
     follows="all"
     layout="topleft"
     left="0"
     top="0"
-    label=""
     height="440"
     width="333">
     <panel
@@ -72,6 +72,7 @@
         follows="all"/>
       </panel>
     <panel
+      name="marketplace_panel_status"
       follows="bottom|left|right"
       layout="topleft"
       left="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
index 54fc3a0c0f..45e0fe04c0 100755
--- a/indra/newview/skins/default/xui/en/panel_marketplace_listings.xml
+++ b/indra/newview/skins/default/xui/en/panel_marketplace_listings.xml
@@ -1,14 +1,13 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <panel
   label="Marketplace"
-  name="main marketplace panel"
+  name="Marketplace Panel"
   follows="all"
   layout="topleft"
   width="308"
   height="375">
   <panel
-    label="tool_panel"
-    name="nearby_buttons_panel"
+    name="tool_panel"
     follows="left|top|right"
     layout="topleft"
     height="30"
@@ -31,13 +30,14 @@
       menu_position="bottomleft"/>
   </panel>
   <panel
+    name="tab_container_panel"
     follows="all"
     layout="topleft"
     default_tab_group="1"
     width="308"
     height="340">
   <tab_container
-    name="marketplace filter tabs"
+    name="marketplace_filter_tabs"
     follows="all"
     layout="topleft"
     top="0"
-- 
cgit v1.2.3


From 6263a4fe6f38bd860e583f3819fb38c5c1d37efd Mon Sep 17 00:00:00 2001
From: Merov Linden <merov@lindenlab.com>
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" />
 	</menu_item_call>
 	<menu_item_call
+        label="Activate"
+        layout="topleft"
+        name="Marketplace Activate">
+		<menu_item_call.on_click
+        function="Inventory.DoToSelected"
+        parameter="marketplace_activate" />
+	</menu_item_call>
+	<menu_item_call
      label="--no options--"
      layout="topleft"
      name="--no options--" />
-- 
cgit v1.2.3


From e1d2f71d348bafe0be783dcb3dfbeb56bc877c12 Mon Sep 17 00:00:00 2001
From: Merov Linden <merov@lindenlab.com>
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">
+	<menu_item_call
+        label="Add Listing"
+        layout="topleft"
+        name="Marketplace Add Listing">
+		<menu_item_call.on_click
+        function="Inventory.DoToSelected"
+        parameter="marketplace_add_listing" />
+	</menu_item_call>
+	<menu_item_call
+        label="Attach Listing"
+        layout="topleft"
+        name="Marketplace Attach Listing">
+		<menu_item_call.on_click
+        function="Inventory.DoToSelected"
+        parameter="marketplace_attach_listing" />
+	</menu_item_call>
+	<menu_item_call
+        label="Show Listing"
+        layout="topleft"
+        name="Marketplace Show Listing">
+		<menu_item_call.on_click
+        function="Inventory.DoToSelected"
+        parameter="marketplace_show_listing" />
+	</menu_item_call>
+	<menu_item_call
+        label="Activate"
+        layout="topleft"
+        name="Marketplace Activate">
+		<menu_item_call.on_click
+        function="Inventory.DoToSelected"
+        parameter="marketplace_activate" />
+	</menu_item_call>
+	<menu_item_call
+        label="Deactivate"
+        layout="topleft"
+        name="Marketplace Deactivate">
+		<menu_item_call.on_click
+        function="Inventory.DoToSelected"
+        parameter="marketplace_deactivate" />
+	</menu_item_call>
+	<menu_item_separator
+    layout="topleft"
+    name="Marketplace Listings Separator" />
     <menu_item_call
      label="Share"
      layout="topleft"
@@ -726,14 +769,6 @@
 		 parameter="send_to_marketplace" />
 	</menu_item_call>
 	<menu_item_call
-        label="Activate"
-        layout="topleft"
-        name="Marketplace Activate">
-		<menu_item_call.on_click
-        function="Inventory.DoToSelected"
-        parameter="marketplace_activate" />
-	</menu_item_call>
-	<menu_item_call
      label="--no options--"
      layout="topleft"
      name="--no options--" />
-- 
cgit v1.2.3


From fc4e9d2572635903449ade6ebf2a45aa9e971023 Mon Sep 17 00:00:00 2001
From: Merov Linden <merov@lindenlab.com>
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.
 	<string name="MarketplaceNoID">no Mkt ID</string>
 	<string name="MarketplaceActive">live</string>
 	<string name="MarketplaceStock">stock</string>
+	<string name="MarketplaceNoStock">out of stock</string>
 
 	<string name="Open landmarks">Open landmarks</string>
 
-- 
cgit v1.2.3


From 748bbeaf982c456b120d4b3f4d33aa6dce576908 Mon Sep 17 00:00:00 2001
From: Merov Linden <merov@lindenlab.com>
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">
 	<menu_item_call
-        label="Add Listing"
+        label="Associate Listing"
         layout="topleft"
-        name="Marketplace Add Listing">
+        name="Marketplace Associate Listing">
 		<menu_item_call.on_click
         function="Inventory.DoToSelected"
-        parameter="marketplace_add_listing" />
+        parameter="marketplace_associate_listing" />
 	</menu_item_call>
 	<menu_item_call
         label="Attach Listing"
@@ -21,6 +21,14 @@
         parameter="marketplace_attach_listing" />
 	</menu_item_call>
 	<menu_item_call
+        label="Disassociate Listing"
+        layout="topleft"
+        name="Marketplace Disassociate Listing">
+		<menu_item_call.on_click
+        function="Inventory.DoToSelected"
+        parameter="marketplace_disassociate_listing" />
+	</menu_item_call>
+	<menu_item_call
         label="Show Listing"
         layout="topleft"
         name="Marketplace Show Listing">
-- 
cgit v1.2.3


From a0f5a63a661d3ebc03e82463897c63dd35918749 Mon Sep 17 00:00:00 2001
From: Merov Linden <merov@lindenlab.com>
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" />
     </menu_item_check>
-    <menu_item_check name="show_active" label="Show Active Listings and Folders Only">
+    <menu_item_check name="show_active" label="Show Active Listings Only">
         <menu_item_check.on_click
         function="Marketplace.ViewSort.Action"
         parameter="show_active" />
-- 
cgit v1.2.3


From 2a031df763ab7ea0f17f263ef9a03f53fbfb1187 Mon Sep 17 00:00:00 2001
From: Merov Linden <merov@lindenlab.com>
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"/>
+    <button
+      name="add_btn"
+      tool_tip="Create a new listing folder"
+      layout="topleft"
+      follows="top|left"
+      width="31"
+      height="25"
+      left_pad="2"
+      image_hover_unselected="Toolbar_Middle_Over"
+      image_overlay="Conv_toolbar_plus"
+      image_selected="Toolbar_Middle_Selected"
+      image_unselected="Toolbar_Middle_Off"/>
+    <button
+      name="audit_btn"
+      tool_tip="Validate your marketplace listings"
+      layout="topleft"
+      follows="top|left"
+      width="31"
+      height="25"
+      left_pad="2"
+      image_hover_unselected="Toolbar_Middle_Over"
+      image_overlay="Info"
+      image_selected="Toolbar_Middle_Selected"
+      image_unselected="Toolbar_Middle_Off"/>
   </panel>
   <panel
     name="tab_container_panel"
-- 
cgit v1.2.3


From 851912b9f8a5fc9f604adf8c43941b7fe27aae09 Mon Sep 17 00:00:00 2001
From: Merov Linden <merov@lindenlab.com>
Date: Tue, 15 Apr 2014 12:12:10 -0700
Subject: DD-65, DD-55: Treat activation/deactivation separately for listing
 and version folders. Also use max instead of stock for suffix for non stock
 folders.

---
 indra/newview/skins/default/xui/en/strings.xml | 4 +++-
 1 file changed, 3 insertions(+), 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 55272750e7..74c85bcd6b 100755
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -2272,7 +2272,9 @@ The [[MARKETPLACE_CREATE_STORE_URL] Marketplace store] is returning errors.
 	<string name="Marketplace Error Internal Import">Error: There was a problem with this item.  Try again later.</string>
 
 	<string name="MarketplaceNoID">no Mkt ID</string>
-	<string name="MarketplaceActive">live</string>
+	<string name="MarketplaceLive">live</string>
+	<string name="MarketplaceActive">active</string>
+	<string name="MarketplaceMax">max</string>
 	<string name="MarketplaceStock">stock</string>
 	<string name="MarketplaceNoStock">out of stock</string>
 
-- 
cgit v1.2.3


From ea5a1546913eea3c2e145828ffe76fac6bdfaee9 Mon Sep 17 00:00:00 2001
From: Merov Linden <merov@lindenlab.com>
Date: Tue, 15 Apr 2014 14:55:40 -0700
Subject: DD-49 : Add FUI button for Marketplace Listings

---
 indra/newview/skins/default/xui/en/strings.xml | 2 ++
 1 file changed, 2 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 74c85bcd6b..21d6669eea 100755
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -3923,6 +3923,7 @@ Try enclosing path to the editor with double quotes.
   <string name="Command_Inventory_Label">Inventory</string>
   <string name="Command_Map_Label">Map</string>
   <string name="Command_Marketplace_Label">Marketplace</string>
+  <string name="Command_MarketplaceListings_Label">Sell on Marketplace</string>
   <string name="Command_MiniMap_Label">Mini-map</string>
   <string name="Command_Move_Label">Walk / run / fly</string>
   <string name="Command_Outbox_Label">Merchant outbox</string>
@@ -3951,6 +3952,7 @@ Try enclosing path to the editor with double quotes.
   <string name="Command_Inventory_Tooltip">View and use your belongings</string>
   <string name="Command_Map_Tooltip">Map of the world</string>
   <string name="Command_Marketplace_Tooltip">Go shopping</string>
+  <string name="Command_MarketplaceListings_Tooltip">Sell your creation</string>
   <string name="Command_MiniMap_Tooltip">Show nearby people</string>
   <string name="Command_Move_Tooltip">Moving your avatar</string>
   <string name="Command_Outbox_Tooltip">Transfer items to your marketplace for sale</string>
-- 
cgit v1.2.3


From a4f6fc8ee1a4231d2b81d28035b21b8f8b3fd8fd Mon Sep 17 00:00:00 2001
From: Merov Linden <merov@lindenlab.com>
Date: Wed, 16 Apr 2014 16:56:01 -0700
Subject: DD-11 : Implement getListingURL() and parametrize it correctly.
 Change Show Listing to Edit Listing.

---
 indra/newview/skins/default/xui/en/menu_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/menu_inventory.xml b/indra/newview/skins/default/xui/en/menu_inventory.xml
index 0be5509333..78418909e8 100755
--- a/indra/newview/skins/default/xui/en/menu_inventory.xml
+++ b/indra/newview/skins/default/xui/en/menu_inventory.xml
@@ -29,7 +29,7 @@
         parameter="marketplace_disassociate_listing" />
 	</menu_item_call>
 	<menu_item_call
-        label="Show Listing"
+        label="Edit Listing"
         layout="topleft"
         name="Marketplace Show Listing">
 		<menu_item_call.on_click
-- 
cgit v1.2.3


From aada85e5b0bcdee88aaa5f0f5ef65913c05c0222 Mon Sep 17 00:00:00 2001
From: Merov Linden <merov@lindenlab.com>
Date: Wed, 16 Apr 2014 17:19:14 -0700
Subject: DD-63 : Suppress the filtering options in the marketplace option
 submenu. Redundants with tabs

---
 .../skins/default/xui/en/menu_marketplace_view.xml | 33 ----------------------
 1 file changed, 33 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 d08cb23483..cff5ec1040 100755
--- a/indra/newview/skins/default/xui/en/menu_marketplace_view.xml
+++ b/indra/newview/skins/default/xui/en/menu_marketplace_view.xml
@@ -13,37 +13,4 @@
          function="Marketplace.ViewSort.CheckItem"
          parameter="sort_by_stock_amount"/>
     </menu_item_check>
-    <menu_item_separator layout="topleft" />
-    <menu_item_check name="show_all" label="Show All">
-        <menu_item_check.on_click
-        function="Marketplace.ViewSort.Action"
-        parameter="show_all" />
-        <menu_item_check.on_check
-        function="Marketplace.ViewSort.CheckItem"
-        parameter="show_all" />
-    </menu_item_check>
-    <menu_item_check name="show_unassociated" label="Show Unassociated Listings Only">
-        <menu_item_check.on_click
-        function="Marketplace.ViewSort.Action"
-        parameter="show_unassociated" />
-        <menu_item_check.on_check
-        function="Marketplace.ViewSort.CheckItem"
-        parameter="show_unassociated" />
-    </menu_item_check>
-    <menu_item_check name="show_active" label="Show Active Listings Only">
-        <menu_item_check.on_click
-        function="Marketplace.ViewSort.Action"
-        parameter="show_active" />
-        <menu_item_check.on_check
-        function="Marketplace.ViewSort.CheckItem"
-        parameter="show_active" />
-    </menu_item_check>
-    <menu_item_check name="show_inactive" label="Show Inactive Listings Only">
-        <menu_item_check.on_click
-        function="Marketplace.ViewSort.Action"
-        parameter="show_inactive" />
-        <menu_item_check.on_check
-        function="Marketplace.ViewSort.CheckItem"
-        parameter="show_inactive" />
-    </menu_item_check>
 </toggleable_menu>
-- 
cgit v1.2.3


From ccdffd9794229b59b7d022760540ce5f8d8ea133 Mon Sep 17 00:00:00 2001
From: Merov Linden <merov@lindenlab.com>
Date: Thu, 17 Apr 2014 11:44:04 -0700
Subject: DD-70 : Use List/Delist for listing folders and Activate/Deactivate
 for version folders. Also create test SLM ID when creating listing.

---
 .../skins/default/xui/en/menu_inventory.xml        | 32 ++++++++++++++++------
 .../default/xui/en/panel_marketplace_listings.xml  | 18 ++++++------
 indra/newview/skins/default/xui/en/strings.xml     |  2 +-
 3 files changed, 34 insertions(+), 18 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 78418909e8..b621d53a6c 100755
--- a/indra/newview/skins/default/xui/en/menu_inventory.xml
+++ b/indra/newview/skins/default/xui/en/menu_inventory.xml
@@ -5,20 +5,20 @@
  name="Popup"
  visible="false">
 	<menu_item_call
-        label="Associate Listing"
+        label="Create Listing"
         layout="topleft"
-        name="Marketplace Associate Listing">
+        name="Marketplace Create Listing">
 		<menu_item_call.on_click
         function="Inventory.DoToSelected"
-        parameter="marketplace_associate_listing" />
+        parameter="marketplace_create_listing" />
 	</menu_item_call>
 	<menu_item_call
-        label="Attach Listing"
+        label="Associate Listing"
         layout="topleft"
-        name="Marketplace Attach Listing">
+        name="Marketplace Associate Listing">
 		<menu_item_call.on_click
         function="Inventory.DoToSelected"
-        parameter="marketplace_attach_listing" />
+        parameter="marketplace_associate_listing" />
 	</menu_item_call>
 	<menu_item_call
         label="Disassociate Listing"
@@ -31,10 +31,26 @@
 	<menu_item_call
         label="Edit Listing"
         layout="topleft"
-        name="Marketplace Show Listing">
+        name="Marketplace Edit Listing">
+		<menu_item_call.on_click
+        function="Inventory.DoToSelected"
+        parameter="marketplace_edit_listing" />
+	</menu_item_call>
+	<menu_item_call
+        label="List"
+        layout="topleft"
+        name="Marketplace List">
+		<menu_item_call.on_click
+        function="Inventory.DoToSelected"
+        parameter="marketplace_list" />
+	</menu_item_call>
+	<menu_item_call
+        label="Unlist"
+        layout="topleft"
+        name="Marketplace Unlist">
 		<menu_item_call.on_click
         function="Inventory.DoToSelected"
-        parameter="marketplace_show_listing" />
+        parameter="marketplace_unlist" />
 	</menu_item_call>
 	<menu_item_call
         label="Activate"
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 3b48c2e48c..acbb428422 100755
--- a/indra/newview/skins/default/xui/en/panel_marketplace_listings.xml
+++ b/indra/newview/skins/default/xui/en/panel_marketplace_listings.xml
@@ -5,7 +5,7 @@
   follows="all"
   layout="topleft"
   width="308"
-  height="375">
+  height="440">
   <panel
     name="tool_panel"
     follows="left|top|right"
@@ -59,7 +59,7 @@
     layout="topleft"
     default_tab_group="1"
     width="308"
-    height="340">
+    height="400">
   <tab_container
     name="marketplace_filter_tabs"
     follows="all"
@@ -68,7 +68,7 @@
     left="0"
     top_pad="0"
     width="308"
-    height="340"
+    height="400"
     halign="center"
     tab_height="30"
     tab_group="1"
@@ -81,7 +81,7 @@
       layout="topleft"
       follows="all"
       width="308"
-      height="310"
+      height="370"
       top="16"
       left="0"
       start_folder.name="Marketplace listings"
@@ -98,13 +98,13 @@
       show_item_link_overlays="true">
     </inventory_panel>
     <inventory_panel
-      label="ACTIVE"
+      label="LISTED"
       name="Active Items"
       help_topic="marketplace_tab"
       layout="topleft"
       follows="all"
       width="308"
-      height="310"
+      height="370"
       left_delta="0"
       start_folder.name="Marketplace listings"
       show_empty_message="false"
@@ -118,13 +118,13 @@
       show_item_link_overlays="true">
     </inventory_panel>
     <inventory_panel
-      label="INACTIVE"
+      label="UNLISTED"
       name="Inactive Items"
       help_topic="marketplace_tab"
       layout="topleft"
       follows="all"
       width="308"
-      height="310"
+      height="370"
       left_delta="0"
       start_folder.name="Marketplace listings"
       show_empty_message="false"
@@ -144,7 +144,7 @@
       layout="topleft"
       follows="all"
       width="308"
-      height="310"
+      height="370"
       left_delta="0"
       start_folder.name="Marketplace listings"
       show_empty_message="false"
diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index 21d6669eea..ab7df75216 100755
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -2272,7 +2272,7 @@ The [[MARKETPLACE_CREATE_STORE_URL] Marketplace store] is returning errors.
 	<string name="Marketplace Error Internal Import">Error: There was a problem with this item.  Try again later.</string>
 
 	<string name="MarketplaceNoID">no Mkt ID</string>
-	<string name="MarketplaceLive">live</string>
+	<string name="MarketplaceLive">listed</string>
 	<string name="MarketplaceActive">active</string>
 	<string name="MarketplaceMax">max</string>
 	<string name="MarketplaceStock">stock</string>
-- 
cgit v1.2.3


From 18da8170a7fc635281fae370e7fb43a361a5cc91 Mon Sep 17 00:00:00 2001
From: Merov Linden <merov@lindenlab.com>
Date: Thu, 17 Apr 2014 16:49:28 -0700
Subject: DD-54 : WIP : Improved validation to wrap items and stock items
 within version folders if necessary. Also hooked up the audit button with the
 validation code though all printout happens in the log

---
 indra/newview/skins/default/xui/en/panel_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/panel_marketplace_listings.xml b/indra/newview/skins/default/xui/en/panel_marketplace_listings.xml
index acbb428422..0ebb7a5f48 100755
--- a/indra/newview/skins/default/xui/en/panel_marketplace_listings.xml
+++ b/indra/newview/skins/default/xui/en/panel_marketplace_listings.xml
@@ -94,7 +94,6 @@
       background_visible="true"
       border="false"
       bevel_style="none"
-      sort_order_setting="InventorySortOrder"
       show_item_link_overlays="true">
     </inventory_panel>
     <inventory_panel
-- 
cgit v1.2.3


From a99e2475443bebb6b9c9d2c8998300ce50f254a8 Mon Sep 17 00:00:00 2001
From: Merov Linden <merov@lindenlab.com>
Date: Fri, 18 Apr 2014 14:41:32 -0700
Subject: DD-58 : Implement associate listing UI and primitive

---
 .../default/xui/en/floater_associate_listing.xml   | 53 ++++++++++++++++++++++
 1 file changed, 53 insertions(+)
 create mode 100755 indra/newview/skins/default/xui/en/floater_associate_listing.xml

(limited to 'indra/newview/skins/default/xui/en')

diff --git a/indra/newview/skins/default/xui/en/floater_associate_listing.xml b/indra/newview/skins/default/xui/en/floater_associate_listing.xml
new file mode 100755
index 0000000000..e019ed58dd
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/floater_associate_listing.xml
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater
+ legacy_header_height="18"
+ can_minimize="false"
+ height="110"
+ layout="topleft"
+ name="associate listing"
+ help_topic="associate_listing"
+ title="ASSOCIATE LISTING"
+ width="375">
+    <text
+     type="string"
+     length="1"
+     follows="top|left"
+     font="SansSerifLarge"
+     height="16"
+     layout="topleft"
+     left="10"
+     top="25"
+     name="message">
+        Listing ID:
+    </text>
+    <line_editor
+     type="string"
+     length="1"
+     follows="top|right"
+     font="SansSerif"
+     height="20"
+     layout="topleft"
+     left_delta="0"
+     name="listing_id"
+     top_pad="5"
+     width="350">
+        Type ID here
+    </line_editor>
+    <button
+     follows="bottom|left"
+     height="23"
+     label="OK"
+     layout="topleft"
+     left="155"
+     name="OK"
+     top_pad="10"
+     width="100" />
+    <button
+     follows="bottom|right"
+     height="23"
+     label="Cancel"
+     layout="topleft"
+     left_pad="5"
+     name="Cancel"
+     width="100" />
+</floater>
-- 
cgit v1.2.3


From e207c89c538ebbe43fe35f681979b332c112751e Mon Sep 17 00:00:00 2001
From: Merov Linden <merov@lindenlab.com>
Date: Fri, 18 Apr 2014 18:44:43 -0700
Subject: DD-19 : WIP : Add marketplace validation modal dialog to view the log
 (no validation text yet)

---
 .../xui/en/floater_marketplace_validation.xml      | 50 ++++++++++++++++++++++
 1 file changed, 50 insertions(+)
 create mode 100755 indra/newview/skins/default/xui/en/floater_marketplace_validation.xml

(limited to 'indra/newview/skins/default/xui/en')

diff --git a/indra/newview/skins/default/xui/en/floater_marketplace_validation.xml b/indra/newview/skins/default/xui/en/floater_marketplace_validation.xml
new file mode 100755
index 0000000000..eaaae60175
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/floater_marketplace_validation.xml
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater
+ legacy_header_height="18"
+ can_close="false"
+ can_minimize="false"
+ height="500"
+ layout="topleft"
+ title="MARKETPLACE VALIDATION LOG"
+ positioning="centered"
+ width="600">
+    <button
+     height="20"
+     label="Continue"
+     label_selected="Continue"
+     layout="topleft"
+     left="484"
+     name="Continue"
+     top="465"
+     width="100" />
+    <text
+     type="string"
+     length="1"
+     follows="left|top"
+     font="SansSerif"
+     height="20"
+     layout="topleft"
+     left="20"
+     name="tos_heading"
+     top="20"
+     width="552">
+        The Marketplace Validation reported the following:
+    </text>
+    <text_editor
+     type="string"
+     length="1"
+     bg_readonly_color="1 1 1 1"
+     bottom="455"
+     follows="left|top"
+     font="SansSerif"
+     layout="topleft"
+     left="20"
+     max_length="65536"
+     name="tos_text"
+     right="-20"
+     text_readonly_color="0 0 0 1"
+     top="45"
+     word_wrap="true">
+        TOS_TEXT
+    </text_editor>
+</floater>
-- 
cgit v1.2.3


From e4863cf7f6f3799be2f85ba0ec808f2b5f509f95 Mon Sep 17 00:00:00 2001
From: Merov Linden <merov@lindenlab.com>
Date: Sun, 20 Apr 2014 20:32:17 -0700
Subject: DD-19 : Implement preliminary audit / validation display

---
 .../skins/default/xui/en/floater_marketplace_validation.xml    | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'indra/newview/skins/default/xui/en')

diff --git a/indra/newview/skins/default/xui/en/floater_marketplace_validation.xml b/indra/newview/skins/default/xui/en/floater_marketplace_validation.xml
index eaaae60175..01d467a307 100755
--- a/indra/newview/skins/default/xui/en/floater_marketplace_validation.xml
+++ b/indra/newview/skins/default/xui/en/floater_marketplace_validation.xml
@@ -10,11 +10,11 @@
  width="600">
     <button
      height="20"
-     label="Continue"
-     label_selected="Continue"
+     label="OK"
+     label_selected="OK"
      layout="topleft"
      left="484"
-     name="Continue"
+     name="OK"
      top="465"
      width="100" />
     <text
@@ -40,11 +40,11 @@
      layout="topleft"
      left="20"
      max_length="65536"
-     name="tos_text"
+     name="validation_text"
      right="-20"
      text_readonly_color="0 0 0 1"
      top="45"
      word_wrap="true">
-        TOS_TEXT
+        MARKETPLACE_VALIDATION_TEXT
     </text_editor>
 </floater>
-- 
cgit v1.2.3


From cda6ac9e9b0dc9c75746440d98a98d3556ec9b4e Mon Sep 17 00:00:00 2001
From: Merov Linden <merov@lindenlab.com>
Date: Mon, 21 Apr 2014 15:26:14 -0700
Subject: DD-71 : Implement a new item properties floater, calls the same code
 as the sidepanel in the inventory but with the back button hidden

---
 .../default/xui/en/floater_item_properties.xml     | 23 ++++++++++++++++++++++
 1 file changed, 23 insertions(+)
 create mode 100755 indra/newview/skins/default/xui/en/floater_item_properties.xml

(limited to 'indra/newview/skins/default/xui/en')

diff --git a/indra/newview/skins/default/xui/en/floater_item_properties.xml b/indra/newview/skins/default/xui/en/floater_item_properties.xml
new file mode 100755
index 0000000000..0fc54a9c8b
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/floater_item_properties.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater
+ legacy_header_height="18"
+ height="570"
+ layout="topleft"
+ name="Item Properties"
+ help_topic="item+properties"
+ title="ITEM PROPERTIES"
+ width="330">
+ <panel
+   follows="all"
+   layout="topleft"
+   left="0"
+   class="sidepanel_item_info"
+   filename="sidepanel_item_info.xml"
+   name="item_panel"
+   top="20"
+   label=""
+   height="570"
+   visible="true"
+   width="330">
+ </panel>
+</floater>
-- 
cgit v1.2.3


From 59f512b375b9be5198c322e2002dea9e5d767e07 Mon Sep 17 00:00:00 2001
From: Merov Linden <merov@lindenlab.com>
Date: Wed, 23 Apr 2014 18:00:34 -0700
Subject: DD-19 : Cleaned up Marketplace Audit UI, make the floater non modal

---
 .../xui/en/floater_marketplace_validation.xml      | 67 ++++++++++++----------
 1 file changed, 38 insertions(+), 29 deletions(-)

(limited to 'indra/newview/skins/default/xui/en')

diff --git a/indra/newview/skins/default/xui/en/floater_marketplace_validation.xml b/indra/newview/skins/default/xui/en/floater_marketplace_validation.xml
index 01d467a307..165540cfa1 100755
--- a/indra/newview/skins/default/xui/en/floater_marketplace_validation.xml
+++ b/indra/newview/skins/default/xui/en/floater_marketplace_validation.xml
@@ -1,49 +1,58 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater
- legacy_header_height="18"
- can_close="false"
- can_minimize="false"
- height="500"
- layout="topleft"
- title="MARKETPLACE VALIDATION LOG"
- positioning="centered"
- width="600">
+    title="MARKETPLACE VALIDATION LOG"
+    name="floater_marketplace_validation"
+    help_topic="floater_marketplace_validation"
+    layout="topleft"
+    positioning="cascading"
+    legacy_header_height="18"
+    width="600"
+    height="500"
+    min_width="400"
+    min_height="200"
+    can_close="true"
+    can_resize="true"
+    can_minimize="true"
+    save_rect="true"
+    reuse_instance="true"
+    save_visibility="false">
     <button
-     height="20"
-     label="OK"
-     label_selected="OK"
-     layout="topleft"
-     left="484"
-     name="OK"
-     top="465"
-     width="100" />
+    name="OK"
+    label="OK"
+    label_selected="OK"
+    layout="topleft"
+    follows="right|bottom"
+    top="465"
+    width="100"
+    height="20"
+    left="484"/>
     <text
+     name="tos_heading"
      type="string"
+     font="SansSerif"
      length="1"
+     layout="topleft"
      follows="left|top"
-     font="SansSerif"
+     width="552"
      height="20"
-     layout="topleft"
      left="20"
-     name="tos_heading"
-     top="20"
-     width="552">
+     top="20">
         The Marketplace Validation reported the following:
     </text>
     <text_editor
+     name="validation_text"
      type="string"
-     length="1"
-     bg_readonly_color="1 1 1 1"
-     bottom="455"
-     follows="left|top"
      font="SansSerif"
+     length="1"
+     max_length="65536"
      layout="topleft"
+     follows="all"
+     bg_readonly_color="TextBgReadOnlyColor"
+     text_readonly_color="TextFgReadOnlyColor"
+     top="45"
+     bottom="455"
      left="20"
-     max_length="65536"
-     name="validation_text"
      right="-20"
-     text_readonly_color="0 0 0 1"
-     top="45"
      word_wrap="true">
         MARKETPLACE_VALIDATION_TEXT
     </text_editor>
-- 
cgit v1.2.3


From 03679c227e0715d51229250c006f9c407bd9d923 Mon Sep 17 00:00:00 2001
From: Merov Linden <merov@lindenlab.com>
Date: Mon, 12 May 2014 13:41:38 -0700
Subject: DD-22 : WIP : Implement the GET /listing/:listing route to complete
 the SLM API coverage. Will be used only in test.

---
 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 b621d53a6c..231e03b1bb 100755
--- a/indra/newview/skins/default/xui/en/menu_inventory.xml
+++ b/indra/newview/skins/default/xui/en/menu_inventory.xml
@@ -29,6 +29,14 @@
         parameter="marketplace_disassociate_listing" />
 	</menu_item_call>
 	<menu_item_call
+        label="Get (Refresh) Listing"
+        layout="topleft"
+        name="Marketplace Get Listing">
+		<menu_item_call.on_click
+        function="Inventory.DoToSelected"
+        parameter="marketplace_get_listing" />
+	</menu_item_call>
+	<menu_item_call
         label="Edit Listing"
         layout="topleft"
         name="Marketplace Edit Listing">
-- 
cgit v1.2.3


From 10591cce8e36e4c27c4a68c68c0502eaa24d8964 Mon Sep 17 00:00:00 2001
From: Merov Linden <merov@lindenlab.com>
Date: Wed, 14 May 2014 15:57:17 -0700
Subject: DD-76, DD-77, DD-90 : recycled can_move_to_outbox() into
 can_move_to_marketplace() so we have now the same logic for both marketplace
 and merchant outbox

---
 indra/newview/skins/default/xui/en/strings.xml | 6 +++---
 1 file changed, 3 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 ab7df75216..ad1af2faa3 100755
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -211,10 +211,10 @@ Please try logging in again in a minute.</string>
 	<string name="TooltipPrice" value="L$[AMOUNT]: "/>
 
 	<string name="TooltipOutboxDragToWorld">You can not rez items in your merchant outbox</string>
-	<string name="TooltipOutboxNoTransfer">One or more of these objects cannot be sold or transferred.</string>
+	<string name="TooltipOutboxNoTransfer">One or more of these objects cannot be sold or transferred</string>
 	<string name="TooltipOutboxNotInInventory">Your merchant outbox can only accept items directly from your inventory</string>
-	<string name="TooltipOutboxWorn">You can not put items you are wearing into your merchant outbox</string>
-	<string name="TooltipOutboxCallingCard">You can not put calling cards into your merchant outbox</string>
+	<string name="TooltipOutboxWorn">You can not put items you are wearing on the marketplace</string>
+	<string name="TooltipOutboxCallingCard">You can not put calling cards on the marketplace</string>
 	<string name="TooltipOutboxFolderLevels">Depth of nested folders exceeds 3</string>
 	<string name="TooltipOutboxTooManyFolders">Subfolder count in top-level folder exceeds 20</string>
 	<string name="TooltipOutboxTooManyObjects">Item count in top-level folder exceeds 200</string>
-- 
cgit v1.2.3


From 8193caa7939643d1080ceb9463b3e3978b0f516a Mon Sep 17 00:00:00 2001
From: Merov Linden <merov@lindenlab.com>
Date: Tue, 20 May 2014 21:40:48 -0700
Subject: DD-88 : Make Drag and Drop tooltips for Merchant Outbox and
 Marketplace restrictions identical

---
 indra/newview/skins/default/xui/en/strings.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 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 ad1af2faa3..18552c3153 100755
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -210,9 +210,9 @@ Please try logging in again in a minute.</string>
 	<string name="TooltipMustSingleDrop">Only a single item can be dragged here</string>
 	<string name="TooltipPrice" value="L$[AMOUNT]: "/>
 
-	<string name="TooltipOutboxDragToWorld">You can not rez items in your merchant outbox</string>
+	<string name="TooltipOutboxDragToWorld">You can not rez items on the marketplace</string>
 	<string name="TooltipOutboxNoTransfer">One or more of these objects cannot be sold or transferred</string>
-	<string name="TooltipOutboxNotInInventory">Your merchant outbox can only accept items directly from your inventory</string>
+	<string name="TooltipOutboxNotInInventory">You can only put items from your inventory on the marketplace</string>
 	<string name="TooltipOutboxWorn">You can not put items you are wearing on the marketplace</string>
 	<string name="TooltipOutboxCallingCard">You can not put calling cards on the marketplace</string>
 	<string name="TooltipOutboxFolderLevels">Depth of nested folders exceeds 3</string>
-- 
cgit v1.2.3


From 2a6ce118882b7ac4ce533dcd3c74f582e01bdb29 Mon Sep 17 00:00:00 2001
From: Merov Linden <merov@lindenlab.com>
Date: Wed, 21 May 2014 16:40:23 -0700
Subject: DD-91, DD-84 : WIP : Verify restrictions when moving things to
 marketplace, provide clear alert for errors, parametrize alerts and tooltips
 correctly

---
 indra/newview/skins/default/xui/en/menu_inventory.xml |  8 --------
 indra/newview/skins/default/xui/en/notifications.xml  | 13 +++++++++++++
 indra/newview/skins/default/xui/en/strings.xml        |  7 ++++---
 3 files changed, 17 insertions(+), 11 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 231e03b1bb..5e67cdf501 100755
--- a/indra/newview/skins/default/xui/en/menu_inventory.xml
+++ b/indra/newview/skins/default/xui/en/menu_inventory.xml
@@ -793,14 +793,6 @@
 		 parameter="copy_to_outbox" />
 	</menu_item_call>
 	<menu_item_call
-	 label="Send to Marketplace"
-	 layout="topleft"
-	 name="Marketplace Send">
-		<menu_item_call.on_click
-		 function="Inventory.DoToSelected"
-		 parameter="send_to_marketplace" />
-	</menu_item_call>
-	<menu_item_call
      label="--no options--"
      layout="topleft"
      name="--no options--" />
diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index 370a2af5e0..dcf53c8804 100755
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -292,6 +292,19 @@ Initialization with the Marketplace failed because of a system or network error.
          name="okbutton"
          yestext="OK"/>
   </notification>
+
+    <notification
+        icon="OutboxStatus_Error"
+        name="MerchantPasteFailed"
+        type="outbox">
+        Copy or move to Marketplace Listings failed with error :
+        
+        &apos;[ERROR_CODE]&apos;
+        
+        <usetemplate
+        name="okbutton"
+        yestext="OK"/>
+    </notification>
     
 
     <notification
diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index 18552c3153..aed628d4f7 100755
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -215,9 +215,9 @@ Please try logging in again in a minute.</string>
 	<string name="TooltipOutboxNotInInventory">You can only put items from your inventory on the marketplace</string>
 	<string name="TooltipOutboxWorn">You can not put items you are wearing on the marketplace</string>
 	<string name="TooltipOutboxCallingCard">You can not put calling cards on the marketplace</string>
-	<string name="TooltipOutboxFolderLevels">Depth of nested folders exceeds 3</string>
-	<string name="TooltipOutboxTooManyFolders">Subfolder count in top-level folder exceeds 20</string>
-	<string name="TooltipOutboxTooManyObjects">Item count in top-level folder exceeds 200</string>
+	<string name="TooltipOutboxFolderLevels">Depth of nested folders exceeds [AMOUNT]</string>
+	<string name="TooltipOutboxTooManyFolders">Subfolder count in top-level folder exceeds [AMOUNT]</string>
+	<string name="TooltipOutboxTooManyObjects">Item count in top-level folder exceeds [AMOUNT]</string>
 	
 	<string name="TooltipDragOntoOwnChild">You can't move a folder into its child</string>
 	<string name="TooltipDragOntoSelf">You can't move a folder into itself</string>
@@ -2264,6 +2264,7 @@ The [[MARKETPLACE_CREATE_STORE_URL] Marketplace store] is returning errors.
 	<string name="Marketplace Error None">No errors</string>
 	<string name="Marketplace Error Not Merchant">Error: Before sending items to the Marketplace you will need to set yourself up as a merchant (free of charge).</string>
 	<string name="Marketplace Error Empty Folder">Error: This folder has no contents.</string>
+	<string name="Marketplace Error Not Accepted">Error: Cannot move item in that folder.</string>
 	<string name="Marketplace Error Unassociated Products">Error: This item failed to upload because your merchant account has too many items unassociated with products.  To fix this error, log in to the marketplace website and reduce your unassociated item count.</string>
 
 	<string name="Marketplace Error Object Limit">Error: This item contains too many objects.  Fix this error by placing objects together in boxes to reduce the total count to less than 200.</string>
-- 
cgit v1.2.3


From 4e0050ae9db61ef5b13c346ff659ae64c3756249 Mon Sep 17 00:00:00 2001
From: Merov Linden <merov@lindenlab.com>
Date: Wed, 28 May 2014 10:16:17 -0700
Subject: DD-91 : WIP : Continue refactor of item checking in marketplace and
 simplify error messages

---
 indra/newview/skins/default/xui/en/strings.xml | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 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 aed628d4f7..4e49c5ba58 100755
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -214,6 +214,7 @@ Please try logging in again in a minute.</string>
 	<string name="TooltipOutboxNoTransfer">One or more of these objects cannot be sold or transferred</string>
 	<string name="TooltipOutboxNotInInventory">You can only put items from your inventory on the marketplace</string>
 	<string name="TooltipOutboxWorn">You can not put items you are wearing on the marketplace</string>
+	<string name="TooltipOutboxLinked">You can not put linked items or folders on the marketplace</string>
 	<string name="TooltipOutboxCallingCard">You can not put calling cards on the marketplace</string>
 	<string name="TooltipOutboxFolderLevels">Depth of nested folders exceeds [AMOUNT]</string>
 	<string name="TooltipOutboxTooManyFolders">Subfolder count in top-level folder exceeds [AMOUNT]</string>
@@ -2261,16 +2262,11 @@ The [[MARKETPLACE_CREATE_STORE_URL] Marketplace store] is returning errors.
         Drag folders to this area to list them for sale on the [[MARKETPLACE_DASHBOARD_URL] Marketplace].
 	</string>
 
-	<string name="Marketplace Error None">No errors</string>
-	<string name="Marketplace Error Not Merchant">Error: Before sending items to the Marketplace you will need to set yourself up as a merchant (free of charge).</string>
-	<string name="Marketplace Error Empty Folder">Error: This folder has no contents.</string>
-	<string name="Marketplace Error Not Accepted">Error: Cannot move item in that folder.</string>
-	<string name="Marketplace Error Unassociated Products">Error: This item failed to upload because your merchant account has too many items unassociated with products.  To fix this error, log in to the marketplace website and reduce your unassociated item count.</string>
-
-	<string name="Marketplace Error Object Limit">Error: This item contains too many objects.  Fix this error by placing objects together in boxes to reduce the total count to less than 200.</string>
-	<string name="Marketplace Error Folder Depth">Error: This item contains too many levels of nested folders.  Reorganize it to a maximum of 3 levels of nested folders.</string>
-	<string name="Marketplace Error Unsellable Item">Error: This item can not be sold on the marketplace.</string>
-	<string name="Marketplace Error Internal Import">Error: There was a problem with this item.  Try again later.</string>
+	<string name="Marketplace Error None">No error</string>
+	<string name="Marketplace Error Prefix">Error: </string>
+	<string name="Marketplace Error Not Merchant">Before sending items to the Marketplace you will need to set yourself up as a merchant (free of charge).</string>
+	<string name="Marketplace Error Not Accepted">Cannot move item in that folder.</string>
+	<string name="Marketplace Error Unsellable Item">This item can not be sold on the marketplace.</string>
 
 	<string name="MarketplaceNoID">no Mkt ID</string>
 	<string name="MarketplaceLive">listed</string>
-- 
cgit v1.2.3


From e19a45a16cf21d422ba08fc1ca186fbba23e15b2 Mon Sep 17 00:00:00 2001
From: Merov Linden <merov@lindenlab.com>
Date: Wed, 28 May 2014 16:07:39 -0700
Subject: DD-91 : Fixed! Get each listing to pass through the folder/size check
 on validation. Make all messages localizable. General clean up

---
 indra/newview/skins/default/xui/en/strings.xml | 9 +++++++++
 1 file changed, 9 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 4e49c5ba58..52d2a596e9 100755
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -2262,6 +2262,15 @@ The [[MARKETPLACE_CREATE_STORE_URL] Marketplace store] is returning errors.
         Drag folders to this area to list them for sale on the [[MARKETPLACE_DASHBOARD_URL] Marketplace].
 	</string>
 
+	<string name="Marketplace Validation Intro">Validation Listing : </string>
+	<string name="Marketplace Validation Log">Log : folder validates, all items of compatible types : </string>
+	<string name="Marketplace Validation Warning Stock">Warning : creating wrapping folder for stock folder : </string>
+	<string name="Marketplace Validation Warning Empty">Warning : folder doesn't contain any item : </string>
+	<string name="Marketplace Validation Warning Create Stock">Warning : creating stock folder : </string>
+	<string name="Marketplace Validation Warning Create Version">Warning : creating version folder : </string>
+	<string name="Marketplace Validation Warning Move">Warning : moving item : </string>
+	<string name="Marketplace Validation Warning Delete">Warning : folder content completely transfered to stock folder, removing empty folder : </string>
+	<string name="Marketplace Validation Error">Error : </string>
 	<string name="Marketplace Error None">No error</string>
 	<string name="Marketplace Error Prefix">Error: </string>
 	<string name="Marketplace Error Not Merchant">Before sending items to the Marketplace you will need to set yourself up as a merchant (free of charge).</string>
-- 
cgit v1.2.3


From 22ee6abe0b4cd354ccbcb9055678356e91d009ff Mon Sep 17 00:00:00 2001
From: Merov Linden <merov@lindenlab.com>
Date: Wed, 28 May 2014 19:26:40 -0700
Subject: DD-84 : WIP : Add confirmation DAMA dialog when moving items in
 active listing

---
 indra/newview/skins/default/xui/en/notifications.xml | 14 +++++++++++++-
 1 file changed, 13 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 dcf53c8804..28ca2c7bd8 100755
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -305,7 +305,19 @@ Initialization with the Marketplace failed because of a system or network error.
         name="okbutton"
         yestext="OK"/>
     </notification>
-    
+
+    <notification
+        icon="alertmodal.tga"
+        name="ConfirmMerchantActiveChange"
+        type="alertmodal">
+        This action will change the active content of this listing. Do you want to continue?
+        <tag>confirm</tag>
+        <usetemplate
+        ignoretext="Confirm before I change an active listing on the marketplace"
+        name="okcancelignore"
+        notext="Cancel"
+        yestext="OK"/>
+    </notification>
 
     <notification
    icon="alertmodal.tga"
-- 
cgit v1.2.3


From 86d75052f65149da6bbe1ade5ea28b6f01aaba17 Mon Sep 17 00:00:00 2001
From: Merov Linden <merov@lindenlab.com>
Date: Tue, 3 Jun 2014 19:46:33 -0700
Subject: DD-84 : Fix all active listing modification actions. Add specific
 message when listing will unlist. Make update skip consistency check when
 called from internal level (not public API).

---
 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 4ed0bb6902..b2533b16ec 100755
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -319,6 +319,19 @@ Initialization with the Marketplace failed because of a system or network error.
         yestext="OK"/>
     </notification>
 
+    <notification
+        icon="alertmodal.tga"
+        name="ConfirmMerchantUnlist"
+        type="alertmodal">
+        This action will unlist this listing. Do you want to continue?
+        <tag>confirm</tag>
+        <usetemplate
+        ignoretext="Confirm before I unlist an active listing on the marketplace"
+        name="okcancelignore"
+        notext="Cancel"
+        yestext="OK"/>
+    </notification>
+    
     <notification
    icon="alertmodal.tga"
    name="CompileQueueSaveText"
-- 
cgit v1.2.3


From dfe8416ca6fcdcb8863cd838fd6eb2ef42ef9c0f Mon Sep 17 00:00:00 2001
From: Merov Linden <merov@lindenlab.com>
Date: Tue, 10 Jun 2014 20:58:59 -0700
Subject: DD-107, DD-111 : Add a tooltip to indicate why you can't move an
 active listing

---
 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 37648ed634..2e8970b09f 100755
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -219,6 +219,7 @@ Please try logging in again in a minute.</string>
 	<string name="TooltipOutboxFolderLevels">Depth of nested folders exceeds [AMOUNT]</string>
 	<string name="TooltipOutboxTooManyFolders">Subfolder count in top-level folder exceeds [AMOUNT]</string>
 	<string name="TooltipOutboxTooManyObjects">Item count in top-level folder exceeds [AMOUNT]</string>
+	<string name="TooltipOutboxDragActive">You can't move an active listed listing</string>
 	
 	<string name="TooltipDragOntoOwnChild">You can't move a folder into its child</string>
 	<string name="TooltipDragOntoSelf">You can't move a folder into itself</string>
-- 
cgit v1.2.3


From 40e847d6f1d42ac7a97396de31b362a788638959 Mon Sep 17 00:00:00 2001
From: Merov Linden <merov@lindenlab.com>
Date: Wed, 11 Jun 2014 15:15:02 -0700
Subject: DD-126 : Ask for confirmation when moving a version folder in a way
 that will deactivate it

---
 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 b2533b16ec..e30f42ae98 100755
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -332,6 +332,19 @@ Initialization with the Marketplace failed because of a system or network error.
         yestext="OK"/>
     </notification>
     
+    <notification
+        icon="alertmodal.tga"
+        name="ConfirmMerchantClearVersion"
+        type="alertmodal">
+        This action will deactivate the version folder of the current listing. Do you want to continue?
+        <tag>confirm</tag>
+        <usetemplate
+        ignoretext="Confirm before I deactivate the version folder of a listing on the marketplace"
+        name="okcancelignore"
+        notext="Cancel"
+        yestext="OK"/>
+    </notification>
+
     <notification
    icon="alertmodal.tga"
    name="CompileQueueSaveText"
-- 
cgit v1.2.3


From 10dc6854a8f677c206aa9d3595f63223d542260e Mon Sep 17 00:00:00 2001
From: Merov Linden <merov@lindenlab.com>
Date: Wed, 11 Jun 2014 19:19:44 -0700
Subject: DD-130 : Count all folders and subfolders from the version folder
 excluding the version folder itself

---
 indra/newview/skins/default/xui/en/strings.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 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 2e8970b09f..2db84f2ab0 100755
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -217,8 +217,8 @@ Please try logging in again in a minute.</string>
 	<string name="TooltipOutboxLinked">You can not put linked items or folders on the marketplace</string>
 	<string name="TooltipOutboxCallingCard">You can not put calling cards on the marketplace</string>
 	<string name="TooltipOutboxFolderLevels">Depth of nested folders exceeds [AMOUNT]</string>
-	<string name="TooltipOutboxTooManyFolders">Subfolder count in top-level folder exceeds [AMOUNT]</string>
-	<string name="TooltipOutboxTooManyObjects">Item count in top-level folder exceeds [AMOUNT]</string>
+	<string name="TooltipOutboxTooManyFolders">Subfolders count exceeds [AMOUNT]</string>
+	<string name="TooltipOutboxTooManyObjects">Items count exceeds [AMOUNT]</string>
 	<string name="TooltipOutboxDragActive">You can't move an active listed listing</string>
 	
 	<string name="TooltipDragOntoOwnChild">You can't move a folder into its child</string>
-- 
cgit v1.2.3


From 140d5f0a22ab531f92b4a3a66c8229f550e1ff5c Mon Sep 17 00:00:00 2001
From: Merov Linden <merov@lindenlab.com>
Date: Wed, 11 Jun 2014 21:25:32 -0700
Subject: DD-98 : Add message with link to marketplace if listing cannot be
 edited

---
 indra/newview/skins/default/xui/en/notifications.xml | 11 +++++++++++
 1 file changed, 11 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 e30f42ae98..11c3ca14d0 100755
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -345,6 +345,17 @@ Initialization with the Marketplace failed because of a system or network error.
         yestext="OK"/>
     </notification>
 
+    <notification
+        icon="alertmodal.tga"
+        name="AlertMerchantListingNotUpdated"
+        type="alertmodal">
+This listing could not be updated.
+[[URL] Click here] to edit it on the Marketplace.
+        <usetemplate
+        name="okbutton"
+        yestext="OK"/>
+    </notification>
+
     <notification
    icon="alertmodal.tga"
    name="CompileQueueSaveText"
-- 
cgit v1.2.3


From 9a5ebdb1af723eed134d9e4e7ef4c7219a45f27b Mon Sep 17 00:00:00 2001
From: Merov Linden <merov@lindenlab.com>
Date: Fri, 4 Jul 2014 15:05:28 -0700
Subject: DD-128 : Fixed. Do not allow clothes or body parts on active listings
 to be worn or rendered IW

---
 indra/newview/skins/default/xui/en/notifications.xml | 8 ++++++++
 1 file changed, 8 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 11c3ca14d0..a7e15ed27c 100755
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -356,6 +356,14 @@ This listing could not be updated.
         yestext="OK"/>
     </notification>
 
+    <notification
+        icon="alertmodal.tga"
+        name="AlertMerchantListingCannotWear"
+        type="alertmodal">
+        You can not wear clothes or body parts that are on the Marketplace.
+        <tag>fail</tag>
+    </notification>
+    
     <notification
    icon="alertmodal.tga"
    name="CompileQueueSaveText"
-- 
cgit v1.2.3


From 83603fc939e60c602773cc87e0b6fa316359d467 Mon Sep 17 00:00:00 2001
From: Merov Linden <merov@lindenlab.com>
Date: Thu, 24 Jul 2014 17:42:44 -0700
Subject: DD-128 : Fixed! Recycled allow_open into allow_wear and use an extra
 virtual methods on bridge items to know if items are wearable or not.

---
 indra/newview/skins/default/xui/en/panel_marketplace_listings.xml | 4 ++++
 indra/newview/skins/default/xui/en/panel_outbox_inventory.xml     | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

(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 0ebb7a5f48..18baa91acb 100755
--- a/indra/newview/skins/default/xui/en/panel_marketplace_listings.xml
+++ b/indra/newview/skins/default/xui/en/panel_marketplace_listings.xml
@@ -95,6 +95,7 @@
       border="false"
       bevel_style="none"
       show_item_link_overlays="true">
+      <item allow_wear="false"/>
     </inventory_panel>
     <inventory_panel
       label="LISTED"
@@ -115,6 +116,7 @@
       border="false"
       bevel_style="none"
       show_item_link_overlays="true">
+      <item allow_wear="false"/>
     </inventory_panel>
     <inventory_panel
       label="UNLISTED"
@@ -135,6 +137,7 @@
       border="false"
       bevel_style="none"
       show_item_link_overlays="true">
+      <item allow_wear="false"/>
     </inventory_panel>
     <inventory_panel
       label="UNASSOCIATED"
@@ -155,6 +158,7 @@
       border="false"
       bevel_style="none"
       show_item_link_overlays="true">
+      <item allow_wear="false"/>
     </inventory_panel>
   </tab_container>
   </panel>
diff --git a/indra/newview/skins/default/xui/en/panel_outbox_inventory.xml b/indra/newview/skins/default/xui/en/panel_outbox_inventory.xml
index c80e5b168a..e7d007ec3e 100755
--- a/indra/newview/skins/default/xui/en/panel_outbox_inventory.xml
+++ b/indra/newview/skins/default/xui/en/panel_outbox_inventory.xml
@@ -28,5 +28,5 @@
               text_pad_right="4"
               arrow_size="12"
               max_folder_item_overlap="2"/>
-      <item allow_open="false"/>
+      <item allow_wear="false"/>
 </inventory_panel>
-- 
cgit v1.2.3


From 51e4ad0ed0ba07328ec8415742a3f5c60afc7244 Mon Sep 17 00:00:00 2001
From: Merov Linden <merov@lindenlab.com>
Date: Sat, 26 Jul 2014 14:44:04 -0700
Subject: DD-101 : Do not list or associate listings that do not validate.
 Present user with relevant error when that happens.

---
 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 8166ba67a3..062a93f3cf 100755
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -306,6 +306,19 @@ Initialization with the Marketplace failed because of a system or network error.
         yestext="OK"/>
     </notification>
 
+    <notification
+        icon="OutboxStatus_Error"
+        name="MerchantListingFailed"
+        type="outbox">
+        Listing to Marketplace failed with error :
+        
+        &apos;[ERROR_CODE]&apos;
+        
+        <usetemplate
+        name="okbutton"
+        yestext="OK"/>
+    </notification>
+    
     <notification
         icon="alertmodal.tga"
         name="ConfirmMerchantActiveChange"
-- 
cgit v1.2.3


From c182a8b79737a67794c032a6b60b038c9b905f57 Mon Sep 17 00:00:00 2001
From: Merov Linden <merov@lindenlab.com>
Date: Tue, 29 Jul 2014 18:20:05 -0700
Subject: DD-69 : Fixed! Added an xml parameter to optionally allow the
 visualization of the root folder on an inventory panel. Used only for
 marketplace floater so far.

---
 indra/newview/skins/default/xui/en/panel_marketplace_listings.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_marketplace_listings.xml b/indra/newview/skins/default/xui/en/panel_marketplace_listings.xml
index 18baa91acb..3d75ad4488 100755
--- a/indra/newview/skins/default/xui/en/panel_marketplace_listings.xml
+++ b/indra/newview/skins/default/xui/en/panel_marketplace_listings.xml
@@ -87,6 +87,7 @@
       start_folder.name="Marketplace listings"
       show_empty_message="false"
       show_load_status="false"
+      show_root_folder="true"
       start_folder.type="merchant"
       tool_tip="Drag and drop items here to sell them"
       bg_opaque_color="DkGray2"
@@ -109,6 +110,7 @@
       start_folder.name="Marketplace listings"
       show_empty_message="false"
       show_load_status="false"
+      show_root_folder="true"
       start_folder.type="merchant"
       bg_opaque_color="DkGray2"
       bg_alpha_color="DkGray2"
@@ -130,6 +132,7 @@
       start_folder.name="Marketplace listings"
       show_empty_message="false"
       show_load_status="false"
+      show_root_folder="true"
       start_folder.type="merchant"
       bg_opaque_color="DkGray2"
       bg_alpha_color="DkGray2"
@@ -151,6 +154,7 @@
       start_folder.name="Marketplace listings"
       show_empty_message="false"
       show_load_status="false"
+      show_root_folder="true"
       start_folder.type="merchant"
       bg_opaque_color="DkGray2"
       bg_alpha_color="DkGray2"
-- 
cgit v1.2.3


From d37c294bd38bf4cae251c33f863e4e6e66ef44db Mon Sep 17 00:00:00 2001
From: Merov Linden <merov@lindenlab.com>
Date: Wed, 30 Jul 2014 20:51:18 -0700
Subject: DD-75 : Prevent dropping on filtered tabs root. Adding an allow_drop
 option to inventory tab and folder view folders so that case can be taken
 into account.

---
 indra/newview/skins/default/xui/en/panel_marketplace_listings.xml | 2 ++
 indra/newview/skins/default/xui/en/strings.xml                    | 1 +
 2 files changed, 3 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 3d75ad4488..4a2d9f27e0 100755
--- a/indra/newview/skins/default/xui/en/panel_marketplace_listings.xml
+++ b/indra/newview/skins/default/xui/en/panel_marketplace_listings.xml
@@ -111,6 +111,7 @@
       show_empty_message="false"
       show_load_status="false"
       show_root_folder="true"
+      allow_drop_on_root="false"
       start_folder.type="merchant"
       bg_opaque_color="DkGray2"
       bg_alpha_color="DkGray2"
@@ -133,6 +134,7 @@
       show_empty_message="false"
       show_load_status="false"
       show_root_folder="true"
+      allow_drop_on_root="false"
       start_folder.type="merchant"
       bg_opaque_color="DkGray2"
       bg_alpha_color="DkGray2"
diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index aa66fc4718..21c82b6290 100755
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -245,6 +245,7 @@ Please try logging in again in a minute.</string>
 	<string name="TooltipOutboxTooManyFolders">Subfolders count exceeds [AMOUNT]</string>
 	<string name="TooltipOutboxTooManyObjects">Items count exceeds [AMOUNT]</string>
 	<string name="TooltipOutboxDragActive">You can't move an active listed listing</string>
+	<string name="TooltipOutboxCannotDropOnRoot">You can't drop items on filtered tabs root</string>
 	
 	<string name="TooltipDragOntoOwnChild">You can't move a folder into its child</string>
 	<string name="TooltipDragOntoSelf">You can't move a folder into itself</string>
-- 
cgit v1.2.3


From 4ad7647e83ed744c74507b97fdb3d10728d83057 Mon Sep 17 00:00:00 2001
From: Merov Linden <merov@lindenlab.com>
Date: Sat, 2 Aug 2014 14:58:26 -0700
Subject: DD-161 : Make marketplace listings root folder not movable and add a
 special tooltip to that effect

---
 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 21c82b6290..3cf8ffae26 100755
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -246,6 +246,7 @@ Please try logging in again in a minute.</string>
 	<string name="TooltipOutboxTooManyObjects">Items count exceeds [AMOUNT]</string>
 	<string name="TooltipOutboxDragActive">You can't move an active listed listing</string>
 	<string name="TooltipOutboxCannotDropOnRoot">You can't drop items on filtered tabs root</string>
+	<string name="TooltipOutboxCannotMoveRoot">You can't move the marketplace listings root folder</string>
 	
 	<string name="TooltipDragOntoOwnChild">You can't move a folder into its child</string>
 	<string name="TooltipDragOntoSelf">You can't move a folder into itself</string>
-- 
cgit v1.2.3


From 7b282512593460d94af47d1a52294cd14fc7f630 Mon Sep 17 00:00:00 2001
From: Merov Linden <merov@lindenlab.com>
Date: Thu, 7 Aug 2014 15:12:02 -0700
Subject: DD-100 : WIP : Setting up inventory panel code in marketplace listing
 so that panels can be deleted and rebuilt with new root

---
 .../en/panel_marketplace_listings_inventory.xml    | 26 ++++++++++++++++++++++
 1 file changed, 26 insertions(+)
 create 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/panel_marketplace_listings_inventory.xml b/indra/newview/skins/default/xui/en/panel_marketplace_listings_inventory.xml
new file mode 100755
index 0000000000..944a42d01c
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/panel_marketplace_listings_inventory.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<inventory_panel
+    label="ALL"
+    name="All Items"
+    help_topic="marketplace_tab"
+    start_folder.name="Marketplace listings"
+    show_empty_message="false"
+    show_load_status="false"
+    show_root_folder="true"
+    start_folder.type="merchant"
+    follows="all"
+    layout="topleft"
+    top="16"
+    left="0"
+    height="370"
+    width="308"
+    top_pad="0"
+    bg_opaque_color="DkGray2"
+    bg_alpha_color="DkGray2"
+    background_visible="true"
+    border="false"
+    bevel_style="none"
+    tool_tip="Drag and drop items here to sell them"
+    show_item_link_overlays="true">
+    <item allow_wear="false"/>
+</inventory_panel>
-- 
cgit v1.2.3


From 231572cfed6d178658bc3333eb97aff34746cb81 Mon Sep 17 00:00:00 2001
From: Merov Linden <merov@lindenlab.com>
Date: Sat, 9 Aug 2014 20:34:55 -0700
Subject: DD-100 : Fixed! Had to create the inventory panels after we get the
 marketplace listings root id

---
 .../default/xui/en/panel_marketplace_listings.xml  | 92 ----------------------
 .../en/panel_marketplace_listings_inventory.xml    | 15 ++--
 .../xui/en/panel_marketplace_listings_listed.xml   | 24 ++++++
 .../en/panel_marketplace_listings_unassociated.xml | 23 ++++++
 .../xui/en/panel_marketplace_listings_unlisted.xml | 24 ++++++
 5 files changed, 78 insertions(+), 100 deletions(-)
 create mode 100755 indra/newview/skins/default/xui/en/panel_marketplace_listings_listed.xml
 create mode 100755 indra/newview/skins/default/xui/en/panel_marketplace_listings_unassociated.xml
 create mode 100755 indra/newview/skins/default/xui/en/panel_marketplace_listings_unlisted.xml

(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 4a2d9f27e0..fd5c9ed422 100755
--- a/indra/newview/skins/default/xui/en/panel_marketplace_listings.xml
+++ b/indra/newview/skins/default/xui/en/panel_marketplace_listings.xml
@@ -74,98 +74,6 @@
     tab_group="1"
     tab_position="top"
     tab_min_width="50">
-    <inventory_panel
-      label="ALL"
-      name="All Items"
-      help_topic="marketplace_tab"
-      layout="topleft"
-      follows="all"
-      width="308"
-      height="370"
-      top="16"
-      left="0"
-      start_folder.name="Marketplace listings"
-      show_empty_message="false"
-      show_load_status="false"
-      show_root_folder="true"
-      start_folder.type="merchant"
-      tool_tip="Drag and drop items here to sell them"
-      bg_opaque_color="DkGray2"
-      bg_alpha_color="DkGray2"
-      background_visible="true"
-      border="false"
-      bevel_style="none"
-      show_item_link_overlays="true">
-      <item allow_wear="false"/>
-    </inventory_panel>
-    <inventory_panel
-      label="LISTED"
-      name="Active Items"
-      help_topic="marketplace_tab"
-      layout="topleft"
-      follows="all"
-      width="308"
-      height="370"
-      left_delta="0"
-      start_folder.name="Marketplace listings"
-      show_empty_message="false"
-      show_load_status="false"
-      show_root_folder="true"
-      allow_drop_on_root="false"
-      start_folder.type="merchant"
-      bg_opaque_color="DkGray2"
-      bg_alpha_color="DkGray2"
-      background_visible="true"
-      border="false"
-      bevel_style="none"
-      show_item_link_overlays="true">
-      <item allow_wear="false"/>
-    </inventory_panel>
-    <inventory_panel
-      label="UNLISTED"
-      name="Inactive Items"
-      help_topic="marketplace_tab"
-      layout="topleft"
-      follows="all"
-      width="308"
-      height="370"
-      left_delta="0"
-      start_folder.name="Marketplace listings"
-      show_empty_message="false"
-      show_load_status="false"
-      show_root_folder="true"
-      allow_drop_on_root="false"
-      start_folder.type="merchant"
-      bg_opaque_color="DkGray2"
-      bg_alpha_color="DkGray2"
-      background_visible="true"
-      border="false"
-      bevel_style="none"
-      show_item_link_overlays="true">
-      <item allow_wear="false"/>
-    </inventory_panel>
-    <inventory_panel
-      label="UNASSOCIATED"
-      name="Unassociated Items"
-      help_topic="marketplace_tab"
-      layout="topleft"
-      follows="all"
-      width="308"
-      height="370"
-      left_delta="0"
-      start_folder.name="Marketplace listings"
-      show_empty_message="false"
-      show_load_status="false"
-      show_root_folder="true"
-      start_folder.type="merchant"
-      bg_opaque_color="DkGray2"
-      bg_alpha_color="DkGray2"
-      background_visible="true"
-      border="false"
-      bevel_style="none"
-      show_item_link_overlays="true">
-      <item allow_wear="false"/>
-    </inventory_panel>
   </tab_container>
   </panel>
 </panel>
\ 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
index 944a42d01c..dc2d4c27b6 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
@@ -3,24 +3,23 @@
     label="ALL"
     name="All Items"
     help_topic="marketplace_tab"
+    layout="topleft"
+    follows="all"
+    width="308"
+    height="370"
+    top="16"
+    left="0"
     start_folder.name="Marketplace listings"
     show_empty_message="false"
     show_load_status="false"
     show_root_folder="true"
     start_folder.type="merchant"
-    follows="all"
-    layout="topleft"
-    top="16"
-    left="0"
-    height="370"
-    width="308"
-    top_pad="0"
+    tool_tip="Drag and drop items here to sell them"
     bg_opaque_color="DkGray2"
     bg_alpha_color="DkGray2"
     background_visible="true"
     border="false"
     bevel_style="none"
-    tool_tip="Drag and drop items here to sell them"
     show_item_link_overlays="true">
     <item allow_wear="false"/>
 </inventory_panel>
diff --git a/indra/newview/skins/default/xui/en/panel_marketplace_listings_listed.xml b/indra/newview/skins/default/xui/en/panel_marketplace_listings_listed.xml
new file mode 100755
index 0000000000..211d21a063
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/panel_marketplace_listings_listed.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<inventory_panel
+    label="LISTED"
+    name="Active Items"
+    help_topic="marketplace_tab"
+    layout="topleft"
+    follows="all"
+    width="308"
+    height="370"
+    left_delta="0"
+    start_folder.name="Marketplace listings"
+    show_empty_message="false"
+    show_load_status="false"
+    show_root_folder="true"
+    allow_drop_on_root="false"
+    start_folder.type="merchant"
+    bg_opaque_color="DkGray2"
+    bg_alpha_color="DkGray2"
+    background_visible="true"
+    border="false"
+    bevel_style="none"
+    show_item_link_overlays="true">
+    <item allow_wear="false"/>
+</inventory_panel>
diff --git a/indra/newview/skins/default/xui/en/panel_marketplace_listings_unassociated.xml b/indra/newview/skins/default/xui/en/panel_marketplace_listings_unassociated.xml
new file mode 100755
index 0000000000..498e22ffbe
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/panel_marketplace_listings_unassociated.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<inventory_panel
+    label="UNASSOCIATED"
+    name="Unassociated Items"
+    help_topic="marketplace_tab"
+    layout="topleft"
+    follows="all"
+    width="308"
+    height="370"
+    left_delta="0"
+    start_folder.name="Marketplace listings"
+    show_empty_message="false"
+    show_load_status="false"
+    show_root_folder="true"
+    start_folder.type="merchant"
+    bg_opaque_color="DkGray2"
+    bg_alpha_color="DkGray2"
+    background_visible="true"
+    border="false"
+    bevel_style="none"
+    show_item_link_overlays="true">
+    <item allow_wear="false"/>
+</inventory_panel>
diff --git a/indra/newview/skins/default/xui/en/panel_marketplace_listings_unlisted.xml b/indra/newview/skins/default/xui/en/panel_marketplace_listings_unlisted.xml
new file mode 100755
index 0000000000..aad7e836e4
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/panel_marketplace_listings_unlisted.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<inventory_panel
+    label="UNLISTED"
+    name="Inactive Items"
+    help_topic="marketplace_tab"
+    layout="topleft"
+    follows="all"
+    width="308"
+    height="370"
+    left_delta="0"
+    start_folder.name="Marketplace listings"
+    show_empty_message="false"
+    show_load_status="false"
+    show_root_folder="true"
+    allow_drop_on_root="false"
+    start_folder.type="merchant"
+    bg_opaque_color="DkGray2"
+    bg_alpha_color="DkGray2"
+    background_visible="true"
+    border="false"
+    bevel_style="none"
+    show_item_link_overlays="true">
+    <item allow_wear="false"/>
+</inventory_panel>
-- 
cgit v1.2.3


From 6ab1e773d55b9dbe4a0af161ac194536a5892904 Mon Sep 17 00:00:00 2001
From: Merov Linden <merov@lindenlab.com>
Date: Fri, 22 Aug 2014 00:18:00 -0700
Subject: DD-122 : WIP : Raise error when trying to list something that is
 empty or has empty stock folders.

---
 indra/newview/skins/default/xui/en/strings.xml | 2 ++
 1 file changed, 2 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 5fb964fba7..0b45a52899 100755
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -2301,6 +2301,8 @@ The [[MARKETPLACE_CREATE_STORE_URL] Marketplace store] is returning errors.
 	<string name="Marketplace Validation Warning Move">Warning : moving item : </string>
 	<string name="Marketplace Validation Warning Delete">Warning : folder content completely transfered to stock folder, removing empty folder : </string>
 	<string name="Marketplace Validation Error">Error : </string>
+	<string name="Marketplace Validation Error Empty Version">Error : cannot list empty version folder : </string>
+	<string name="Marketplace Validation Error Empty Stock">Error : cannot list empty stock folder : </string>
 	<string name="Marketplace Error None">No error</string>
 	<string name="Marketplace Error Prefix">Error: </string>
 	<string name="Marketplace Error Not Merchant">Before sending items to the Marketplace you will need to set yourself up as a merchant (free of charge).</string>
-- 
cgit v1.2.3


From c4ad85ecb9c85cdbedec6c297ae3ab2bc5eb554b Mon Sep 17 00:00:00 2001
From: Merov Linden <merov@lindenlab.com>
Date: Sat, 23 Aug 2014 14:46:59 -0700
Subject: DD-19 : WIP : Cleaned up marketplace validation UI as requested per
 Producer

---
 .../xui/en/floater_marketplace_validation.xml      | 17 ++-------------
 indra/newview/skins/default/xui/en/strings.xml     | 24 +++++++++++-----------
 2 files changed, 14 insertions(+), 27 deletions(-)

(limited to 'indra/newview/skins/default/xui/en')

diff --git a/indra/newview/skins/default/xui/en/floater_marketplace_validation.xml b/indra/newview/skins/default/xui/en/floater_marketplace_validation.xml
index 165540cfa1..9035a7c161 100755
--- a/indra/newview/skins/default/xui/en/floater_marketplace_validation.xml
+++ b/indra/newview/skins/default/xui/en/floater_marketplace_validation.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater
-    title="MARKETPLACE VALIDATION LOG"
+    title="Audit Marketplace Listings"
     name="floater_marketplace_validation"
     help_topic="floater_marketplace_validation"
     layout="topleft"
@@ -26,19 +26,6 @@
     width="100"
     height="20"
     left="484"/>
-    <text
-     name="tos_heading"
-     type="string"
-     font="SansSerif"
-     length="1"
-     layout="topleft"
-     follows="left|top"
-     width="552"
-     height="20"
-     left="20"
-     top="20">
-        The Marketplace Validation reported the following:
-    </text>
     <text_editor
      name="validation_text"
      type="string"
@@ -49,7 +36,7 @@
      follows="all"
      bg_readonly_color="TextBgReadOnlyColor"
      text_readonly_color="TextFgReadOnlyColor"
-     top="45"
+     top="25"
      bottom="455"
      left="20"
      right="-20"
diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index 0b45a52899..b2f28748b2 100755
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -2292,18 +2292,18 @@ The [[MARKETPLACE_CREATE_STORE_URL] Marketplace store] is returning errors.
         Drag folders to this area to list them for sale on the [[MARKETPLACE_DASHBOARD_URL] Marketplace].
 	</string>
 
-	<string name="Marketplace Validation Intro">Validation Listing : </string>
-	<string name="Marketplace Validation Log">Log : folder validates, all items of compatible types : </string>
-	<string name="Marketplace Validation Warning Stock">Warning : creating wrapping folder for stock folder : </string>
-	<string name="Marketplace Validation Warning Empty">Warning : folder doesn't contain any item : </string>
-	<string name="Marketplace Validation Warning Create Stock">Warning : creating stock folder : </string>
-	<string name="Marketplace Validation Warning Create Version">Warning : creating version folder : </string>
-	<string name="Marketplace Validation Warning Move">Warning : moving item : </string>
-	<string name="Marketplace Validation Warning Delete">Warning : folder content completely transfered to stock folder, removing empty folder : </string>
-	<string name="Marketplace Validation Error">Error : </string>
-	<string name="Marketplace Validation Error Empty Version">Error : cannot list empty version folder : </string>
-	<string name="Marketplace Validation Error Empty Stock">Error : cannot list empty stock folder : </string>
-	<string name="Marketplace Error None">No error</string>
+	<string name="Marketplace Validation Intro"></string>
+	<string name="Marketplace Validation Log">: No errors</string>
+	<string name="Marketplace Validation Warning Stock">: Warning: creating wrapping folder for stock folder</string>
+	<string name="Marketplace Validation Warning Empty">: Warning: folder doesn't contain any item</string>
+	<string name="Marketplace Validation Warning Create Stock">: Warning: creating stock folder</string>
+	<string name="Marketplace Validation Warning Create Version">: Warning: creating version folder</string>
+	<string name="Marketplace Validation Warning Move">: Warning : moving items</string>
+	<string name="Marketplace Validation Warning Delete">: Warning: folder content transfered to stock folder, removing empty folder</string>
+	<string name="Marketplace Validation Error">: Error: </string>
+	<string name="Marketplace Validation Error Empty Version">: Error: cannot list empty version folder</string>
+	<string name="Marketplace Validation Error Empty Stock">: Error: cannot list empty stock folder</string>
+	<string name="Marketplace Error None">No errors</string>
 	<string name="Marketplace Error Prefix">Error: </string>
 	<string name="Marketplace Error Not Merchant">Before sending items to the Marketplace you will need to set yourself up as a merchant (free of charge).</string>
 	<string name="Marketplace Error Not Accepted">Cannot move item in that folder.</string>
-- 
cgit v1.2.3


From 85ec32c05e3474e55db142489f91e978df319951 Mon Sep 17 00:00:00 2001
From: Merov Linden <merov@lindenlab.com>
Date: Mon, 25 Aug 2014 10:02:13 -0700
Subject: DD-105 : WIP : Adding (updating...) suffix when SLM transaction in
 progress

---
 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 b2f28748b2..b51d7d75c3 100755
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -2315,6 +2315,7 @@ The [[MARKETPLACE_CREATE_STORE_URL] Marketplace store] is returning errors.
 	<string name="MarketplaceMax">max</string>
 	<string name="MarketplaceStock">stock</string>
 	<string name="MarketplaceNoStock">out of stock</string>
+	<string name="MarketplaceUpdating">updating...</string>
 
 	<string name="Open landmarks">Open landmarks</string>
   <string name="Unconstrained">Unconstrained</string>
-- 
cgit v1.2.3


From d6defce1a1cad39c3a65e4ea1674f34c276d0aeb Mon Sep 17 00:00:00 2001
From: Merov Linden <merov@lindenlab.com>
Date: Mon, 25 Aug 2014 23:56:34 -0700
Subject: DD-19 : Print errors in bold, sort folders alphabetically, simplify
 log text when no errors

---
 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 b51d7d75c3..99d64412c3 100755
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -2293,7 +2293,7 @@ The [[MARKETPLACE_CREATE_STORE_URL] Marketplace store] is returning errors.
 	</string>
 
 	<string name="Marketplace Validation Intro"></string>
-	<string name="Marketplace Validation Log">: No errors</string>
+	<string name="Marketplace Validation Log"></string>
 	<string name="Marketplace Validation Warning Stock">: Warning: creating wrapping folder for stock folder</string>
 	<string name="Marketplace Validation Warning Empty">: Warning: folder doesn't contain any item</string>
 	<string name="Marketplace Validation Warning Create Stock">: Warning: creating stock folder</string>
-- 
cgit v1.2.3


From 7643a0571ebd92a31ac293cea18d21a160e3d46f Mon Sep 17 00:00:00 2001
From: Merov Linden <merov@lindenlab.com>
Date: Mon, 1 Sep 2014 16:49:35 -0700
Subject: DD-168 : Display an error message when SLM transactions fail

---
 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 02009e63e0..900ed0f77a 100755
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -305,7 +305,21 @@ Initialization with the Marketplace failed because of a system or network error.
         name="okbutton"
         yestext="OK"/>
     </notification>
-
+    
+    <notification
+        icon="OutboxStatus_Error"
+        name="MerchantTransactionFailed"
+        type="outbox">
+        Transaction with the Marketplace failed with error :
+        
+        Reason : &apos;[ERROR_REASON]&apos;
+        [ERROR_DESCRIPTION]
+        
+        <usetemplate
+        name="okbutton"
+        yestext="OK"/>
+    </notification>
+    
     <notification
         icon="OutboxStatus_Error"
         name="MerchantListingFailed"
-- 
cgit v1.2.3


From 997bd029759afddb5f75c9ec5ccde212f82c387a Mon Sep 17 00:00:00 2001
From: Merov Linden <merov@lindenlab.com>
Date: Wed, 3 Sep 2014 20:22:20 -0700
Subject: DD-168 : Changed text of notification 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 900ed0f77a..5fd85ba32e 100755
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -310,7 +310,7 @@ Initialization with the Marketplace failed because of a system or network error.
         icon="OutboxStatus_Error"
         name="MerchantTransactionFailed"
         type="outbox">
-        Transaction with the Marketplace failed with error :
+        The transaction with the Marketplace failed with the following error :
         
         Reason : &apos;[ERROR_REASON]&apos;
         [ERROR_DESCRIPTION]
-- 
cgit v1.2.3


From 9fd904220bb304a7827d255dc4c03c35ffdc945e Mon Sep 17 00:00:00 2001
From: Merov Linden <merov@lindenlab.com>
Date: Sun, 7 Sep 2014 22:54:50 -0700
Subject: DD-195 : Add text filtering to the marketplace listings floater

---
 .../skins/default/xui/en/panel_marketplace_listings.xml   | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

(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 fd5c9ed422..1953fae72e 100755
--- a/indra/newview/skins/default/xui/en/panel_marketplace_listings.xml
+++ b/indra/newview/skins/default/xui/en/panel_marketplace_listings.xml
@@ -60,15 +60,26 @@
     default_tab_group="1"
     width="308"
     height="400">
+  <filter_editor
+    text_pad_left="10"
+    follows="left|top|right"
+    height="23"
+    label="Filter Marketplace Listings"
+    layout="topleft"
+    left="0"
+    max_length_chars="300"
+    name="filter_editor"
+    top="0"
+    width="308" />
   <tab_container
     name="marketplace_filter_tabs"
     follows="all"
     layout="topleft"
-    top="0"
+    top="30"
     left="0"
     top_pad="0"
     width="308"
-    height="400"
+    height="370"
     halign="center"
     tab_height="30"
     tab_group="1"
-- 
cgit v1.2.3


From 3585ac1ad78ecf543086d61265c7a1ffec0250bb Mon Sep 17 00:00:00 2001
From: Merov Linden <merov@lindenlab.com>
Date: Tue, 9 Sep 2014 21:22:54 -0700
Subject: DD-180 : Simple xml fix so that the last item in inventory panels is
 selectable

---
 indra/newview/skins/default/xui/en/floater_marketplace_listings.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 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 f5630aeecb..8f58146a48 100755
--- a/indra/newview/skins/default/xui/en/floater_marketplace_listings.xml
+++ b/indra/newview/skins/default/xui/en/floater_marketplace_listings.xml
@@ -25,7 +25,7 @@
     <panel
       follows="all"
       left="10"
-      height="420"
+      height="440"
       width="313"
       top="0"
       bg_opaque_color="InventoryBackgroundColor">
@@ -36,7 +36,7 @@
         top="0"
         left="0"
         width="313"
-        height="420"
+        height="440"
         bg_opaque_color="InventoryBackgroundColor">
         <text
           name="marketplace_listings_inventory_placeholder_title"
-- 
cgit v1.2.3


From 221c184ebb5e20440cde974ac2bc5eab84690dd4 Mon Sep 17 00:00:00 2001
From: Merov Linden <merov@lindenlab.com>
Date: Sun, 14 Sep 2014 21:44:04 -0700
Subject: DD-193 : Suppress show_load_status from inventory_panel description
 xml since it's not used anywhere

---
 .../skins/default/xui/en/panel_marketplace_listings_inventory.xml      | 1 -
 .../newview/skins/default/xui/en/panel_marketplace_listings_listed.xml | 1 -
 .../skins/default/xui/en/panel_marketplace_listings_unassociated.xml   | 1 -
 .../skins/default/xui/en/panel_marketplace_listings_unlisted.xml       | 1 -
 indra/newview/skins/default/xui/en/panel_outbox_inventory.xml          | 1 -
 indra/newview/skins/default/xui/en/widgets/inbox_inventory_panel.xml   | 3 +--
 indra/newview/skins/default/xui/en/widgets/inventory_panel.xml         | 1 -
 7 files changed, 1 insertion(+), 8 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 dc2d4c27b6..d6922602fb 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
@@ -11,7 +11,6 @@
     left="0"
     start_folder.name="Marketplace listings"
     show_empty_message="false"
-    show_load_status="false"
     show_root_folder="true"
     start_folder.type="merchant"
     tool_tip="Drag and drop items here to sell them"
diff --git a/indra/newview/skins/default/xui/en/panel_marketplace_listings_listed.xml b/indra/newview/skins/default/xui/en/panel_marketplace_listings_listed.xml
index 211d21a063..40ffb1b13c 100755
--- a/indra/newview/skins/default/xui/en/panel_marketplace_listings_listed.xml
+++ b/indra/newview/skins/default/xui/en/panel_marketplace_listings_listed.xml
@@ -10,7 +10,6 @@
     left_delta="0"
     start_folder.name="Marketplace listings"
     show_empty_message="false"
-    show_load_status="false"
     show_root_folder="true"
     allow_drop_on_root="false"
     start_folder.type="merchant"
diff --git a/indra/newview/skins/default/xui/en/panel_marketplace_listings_unassociated.xml b/indra/newview/skins/default/xui/en/panel_marketplace_listings_unassociated.xml
index 498e22ffbe..20b1b9fbb7 100755
--- a/indra/newview/skins/default/xui/en/panel_marketplace_listings_unassociated.xml
+++ b/indra/newview/skins/default/xui/en/panel_marketplace_listings_unassociated.xml
@@ -10,7 +10,6 @@
     left_delta="0"
     start_folder.name="Marketplace listings"
     show_empty_message="false"
-    show_load_status="false"
     show_root_folder="true"
     start_folder.type="merchant"
     bg_opaque_color="DkGray2"
diff --git a/indra/newview/skins/default/xui/en/panel_marketplace_listings_unlisted.xml b/indra/newview/skins/default/xui/en/panel_marketplace_listings_unlisted.xml
index aad7e836e4..7c7e706e41 100755
--- a/indra/newview/skins/default/xui/en/panel_marketplace_listings_unlisted.xml
+++ b/indra/newview/skins/default/xui/en/panel_marketplace_listings_unlisted.xml
@@ -10,7 +10,6 @@
     left_delta="0"
     start_folder.name="Marketplace listings"
     show_empty_message="false"
-    show_load_status="false"
     show_root_folder="true"
     allow_drop_on_root="false"
     start_folder.type="merchant"
diff --git a/indra/newview/skins/default/xui/en/panel_outbox_inventory.xml b/indra/newview/skins/default/xui/en/panel_outbox_inventory.xml
index e7d007ec3e..b2d8bb874b 100755
--- a/indra/newview/skins/default/xui/en/panel_outbox_inventory.xml
+++ b/indra/newview/skins/default/xui/en/panel_outbox_inventory.xml
@@ -3,7 +3,6 @@
     name="inventory_outbox"
     start_folder.name="Outbox"
     show_empty_message="false"
-    show_load_status="false"
     start_folder.type="outbox"
     follows="all" layout="topleft"
     top="0" left="0" height="165" width="308"
diff --git a/indra/newview/skins/default/xui/en/widgets/inbox_inventory_panel.xml b/indra/newview/skins/default/xui/en/widgets/inbox_inventory_panel.xml
index d5b10e7f51..92f815d4bf 100755
--- a/indra/newview/skins/default/xui/en/widgets/inbox_inventory_panel.xml
+++ b/indra/newview/skins/default/xui/en/widgets/inbox_inventory_panel.xml
@@ -1,3 +1,2 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<inbox_inventory_panel show_load_status="false"
-                       start_folder.type="inbox"/>
+<inbox_inventory_panel start_folder.type="inbox"/>
diff --git a/indra/newview/skins/default/xui/en/widgets/inventory_panel.xml b/indra/newview/skins/default/xui/en/widgets/inventory_panel.xml
index eaf148c5e4..d5efd723c4 100755
--- a/indra/newview/skins/default/xui/en/widgets/inventory_panel.xml
+++ b/indra/newview/skins/default/xui/en/widgets/inventory_panel.xml
@@ -3,7 +3,6 @@
   bg_opaque_color="InventoryBackgroundColor"
   background_visible="true"
   background_opaque="true"
-  show_load_status="true"
   accepts_drag_and_drop="true"
   >
     <scroll
-- 
cgit v1.2.3


From 1a334a1005d116b99eca45c1e4a1a475c9dba68d Mon Sep 17 00:00:00 2001
From: Merov Linden <merov@lindenlab.com>
Date: Tue, 16 Sep 2014 10:39:23 -0700
Subject: DD-23 : WIP : Catch the SLM_UPDATE_FOLDER notification and trigger
 the GET /listing route so to get the updated SLM status for the listing

---
 indra/newview/skins/default/xui/en/notifications.xml | 7 +++++++
 1 file changed, 7 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 1aafbd4b11..fd9547fd76 100755
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -4552,6 +4552,13 @@ Are you sure you want to change the Estate Covenant?
   </notification>
 
   <notification
+    icon="alertmodal.tga"
+    name="SLM_UPDATE_FOLDER"
+    type="alertmodal">
+    [MESSAGE]
+  </notification>
+
+   <notification
    icon="alertmodal.tga"
    name="RegionEntryAccessBlocked_AdultsOnlyContent"
    type="alertmodal">
-- 
cgit v1.2.3


From e9a0b933957d9a620011c43aa37f4c5ee5a74c2e Mon Sep 17 00:00:00 2001
From: Merov Linden <merov@lindenlab.com>
Date: Mon, 22 Sep 2014 09:27:15 -0700
Subject: DD-19 : WIP : Tweak Validation messages as required by producer

---
 indra/newview/skins/default/xui/en/strings.xml | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 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 99d64412c3..ea8b223a98 100755
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -242,8 +242,8 @@ Please try logging in again in a minute.</string>
 	<string name="TooltipOutboxLinked">You can not put linked items or folders on the marketplace</string>
 	<string name="TooltipOutboxCallingCard">You can not put calling cards on the marketplace</string>
 	<string name="TooltipOutboxFolderLevels">Depth of nested folders exceeds [AMOUNT]</string>
-	<string name="TooltipOutboxTooManyFolders">Subfolders count exceeds [AMOUNT]</string>
-	<string name="TooltipOutboxTooManyObjects">Items count exceeds [AMOUNT]</string>
+	<string name="TooltipOutboxTooManyFolders">Subfolder count exceeds [AMOUNT]</string>
+	<string name="TooltipOutboxTooManyObjects">Item count exceeds [AMOUNT]</string>
 	<string name="TooltipOutboxDragActive">You can't move an active listed listing</string>
 	<string name="TooltipOutboxCannotDropOnRoot">You can't drop items on filtered tabs root</string>
 	<string name="TooltipOutboxCannotMoveRoot">You can't move the marketplace listings root folder</string>
@@ -2294,15 +2294,16 @@ The [[MARKETPLACE_CREATE_STORE_URL] Marketplace store] is returning errors.
 
 	<string name="Marketplace Validation Intro"></string>
 	<string name="Marketplace Validation Log"></string>
-	<string name="Marketplace Validation Warning Stock">: Warning: creating wrapping folder for stock folder</string>
+	<string name="Marketplace Validation Warning Stock">: Warning: stock folder must be contained by a version folder</string>
 	<string name="Marketplace Validation Warning Empty">: Warning: folder doesn't contain any item</string>
 	<string name="Marketplace Validation Warning Create Stock">: Warning: creating stock folder</string>
 	<string name="Marketplace Validation Warning Create Version">: Warning: creating version folder</string>
 	<string name="Marketplace Validation Warning Move">: Warning : moving items</string>
 	<string name="Marketplace Validation Warning Delete">: Warning: folder content transfered to stock folder, removing empty folder</string>
+	<string name="Marketplace Validation Warning Stock Item">: Warning: no-copy item must be contained by a stock folder</string>
 	<string name="Marketplace Validation Error">: Error: </string>
-	<string name="Marketplace Validation Error Empty Version">: Error: cannot list empty version folder</string>
-	<string name="Marketplace Validation Error Empty Stock">: Error: cannot list empty stock folder</string>
+	<string name="Marketplace Validation Error Empty Version">: Error: version folder must contain at least 1 item</string>
+	<string name="Marketplace Validation Error Empty Stock">: Error: stock folder must contain at least 1 item</string>
 	<string name="Marketplace Error None">No errors</string>
 	<string name="Marketplace Error Prefix">Error: </string>
 	<string name="Marketplace Error Not Merchant">Before sending items to the Marketplace you will need to set yourself up as a merchant (free of charge).</string>
-- 
cgit v1.2.3


From c94191b2d2d5a11cb6d8f4d90526bf280aa77926 Mon Sep 17 00:00:00 2001
From: Merov Linden <merov@lindenlab.com>
Date: Mon, 22 Sep 2014 17:54:05 -0700
Subject: DD-19 : Fix all the subcases signaled by QA and producers, though not
 with the same messages. Needs validation by producer.

---
 indra/newview/skins/default/xui/en/strings.xml | 3 ++-
 1 file changed, 2 insertions(+), 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 ea8b223a98..86129647d0 100755
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -2292,15 +2292,16 @@ The [[MARKETPLACE_CREATE_STORE_URL] Marketplace store] is returning errors.
         Drag folders to this area to list them for sale on the [[MARKETPLACE_DASHBOARD_URL] Marketplace].
 	</string>
 
-	<string name="Marketplace Validation Intro"></string>
 	<string name="Marketplace Validation Log"></string>
 	<string name="Marketplace Validation Warning Stock">: Warning: stock folder must be contained by a version folder</string>
+	<string name="Marketplace Validation Warning Mixed Stock">: Warning: all items in a stock folder must be no-copy and of the same type</string>
 	<string name="Marketplace Validation Warning Empty">: Warning: folder doesn't contain any item</string>
 	<string name="Marketplace Validation Warning Create Stock">: Warning: creating stock folder</string>
 	<string name="Marketplace Validation Warning Create Version">: Warning: creating version folder</string>
 	<string name="Marketplace Validation Warning Move">: Warning : moving items</string>
 	<string name="Marketplace Validation Warning Delete">: Warning: folder content transfered to stock folder, removing empty folder</string>
 	<string name="Marketplace Validation Warning Stock Item">: Warning: no-copy item must be contained by a stock folder</string>
+	<string name="Marketplace Validation Warning Unwrapped Item">: Warning: items must be contained by a version folder</string>
 	<string name="Marketplace Validation Error">: Error: </string>
 	<string name="Marketplace Validation Error Empty Version">: Error: version folder must contain at least 1 item</string>
 	<string name="Marketplace Validation Error Empty Stock">: Error: stock folder must contain at least 1 item</string>
-- 
cgit v1.2.3


From 5d1c0f6a10d39d61069011be2b128c3a2fe03459 Mon Sep 17 00:00:00 2001
From: Merov Linden <merov@lindenlab.com>
Date: Tue, 23 Sep 2014 09:59:33 -0700
Subject: DD-196 : Add message to panel when search returns empty

---
 .../skins/default/xui/en/panel_marketplace_listings_inventory.xml       | 2 +-
 .../newview/skins/default/xui/en/panel_marketplace_listings_listed.xml  | 2 +-
 .../skins/default/xui/en/panel_marketplace_listings_unassociated.xml    | 2 +-
 .../skins/default/xui/en/panel_marketplace_listings_unlisted.xml        | 2 +-
 indra/newview/skins/default/xui/en/strings.xml                          | 1 +
 5 files changed, 5 insertions(+), 4 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 d6922602fb..16e7fbbfeb 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
@@ -10,7 +10,7 @@
     top="16"
     left="0"
     start_folder.name="Marketplace listings"
-    show_empty_message="false"
+    show_empty_message="true"
     show_root_folder="true"
     start_folder.type="merchant"
     tool_tip="Drag and drop items here to sell them"
diff --git a/indra/newview/skins/default/xui/en/panel_marketplace_listings_listed.xml b/indra/newview/skins/default/xui/en/panel_marketplace_listings_listed.xml
index 40ffb1b13c..181eee70e2 100755
--- a/indra/newview/skins/default/xui/en/panel_marketplace_listings_listed.xml
+++ b/indra/newview/skins/default/xui/en/panel_marketplace_listings_listed.xml
@@ -9,7 +9,7 @@
     height="370"
     left_delta="0"
     start_folder.name="Marketplace listings"
-    show_empty_message="false"
+    show_empty_message="true"
     show_root_folder="true"
     allow_drop_on_root="false"
     start_folder.type="merchant"
diff --git a/indra/newview/skins/default/xui/en/panel_marketplace_listings_unassociated.xml b/indra/newview/skins/default/xui/en/panel_marketplace_listings_unassociated.xml
index 20b1b9fbb7..6ea4784c4c 100755
--- a/indra/newview/skins/default/xui/en/panel_marketplace_listings_unassociated.xml
+++ b/indra/newview/skins/default/xui/en/panel_marketplace_listings_unassociated.xml
@@ -9,7 +9,7 @@
     height="370"
     left_delta="0"
     start_folder.name="Marketplace listings"
-    show_empty_message="false"
+    show_empty_message="true"
     show_root_folder="true"
     start_folder.type="merchant"
     bg_opaque_color="DkGray2"
diff --git a/indra/newview/skins/default/xui/en/panel_marketplace_listings_unlisted.xml b/indra/newview/skins/default/xui/en/panel_marketplace_listings_unlisted.xml
index 7c7e706e41..0d19d09918 100755
--- a/indra/newview/skins/default/xui/en/panel_marketplace_listings_unlisted.xml
+++ b/indra/newview/skins/default/xui/en/panel_marketplace_listings_unlisted.xml
@@ -9,7 +9,7 @@
     height="370"
     left_delta="0"
     start_folder.name="Marketplace listings"
-    show_empty_message="false"
+    show_empty_message="true"
     show_root_folder="true"
     allow_drop_on_root="false"
     start_folder.type="merchant"
diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index 86129647d0..97d8c3ce5c 100755
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -2259,6 +2259,7 @@ For AI Character: Get the closest navigable point to the point provided.
 	<string name="InventoryNoMatchingItems">Didn't find what you're looking for? Try [secondlife:///app/search/all/[SEARCH_TERM] Search].</string>
 	<string name="PlacesNoMatchingItems">Didn't find what you're looking for? Try [secondlife:///app/search/places/[SEARCH_TERM] Search].</string>
 	<string name="FavoritesNoMatchingItems">Drag a landmark here to add it to your favorites.</string>
+	<string name="MarketplaceNoMatchingItems">No Marketplace Listings item found for this search string.</string>
 	<string name="InventoryNoTexture">You do not have a copy of this texture in your inventory</string>
 	<string name="InventoryInboxNoItems">Your Marketplace purchases will appear here. You may then drag them into your inventory to use them.</string>
 	<string name="MarketplaceURL">https://marketplace.[MARKETPLACE_DOMAIN_NAME]/</string>
-- 
cgit v1.2.3


From 10b8f8952321eee959f1b4cf2255782c61683900 Mon Sep 17 00:00:00 2001
From: Merov Linden <merov@lindenlab.com>
Date: Tue, 23 Sep 2014 13:57:43 -0700
Subject: DD-19 : Fixed messages in Validation as requested by producers

---
 indra/newview/skins/default/xui/en/strings.xml | 9 +++++----
 1 file changed, 5 insertions(+), 4 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 97d8c3ce5c..f79c8352e1 100755
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -2294,16 +2294,17 @@ The [[MARKETPLACE_CREATE_STORE_URL] Marketplace store] is returning errors.
 	</string>
 
 	<string name="Marketplace Validation Log"></string>
-	<string name="Marketplace Validation Warning Stock">: Warning: stock folder must be contained by a version folder</string>
-	<string name="Marketplace Validation Warning Mixed Stock">: Warning: all items in a stock folder must be no-copy and of the same type</string>
-	<string name="Marketplace Validation Warning Empty">: Warning: folder doesn't contain any item</string>
+	<string name="Marketplace Validation Warning Stock">stock folder must be contained by a version folder</string>
+	<string name="Marketplace Validation Error Mixed Stock">: Error: all items in a stock folder must be no-copy and of the same type</string>
+	<string name="Marketplace Validation Warning Empty">: Warning: folder doesn't contain any items</string>
 	<string name="Marketplace Validation Warning Create Stock">: Warning: creating stock folder</string>
 	<string name="Marketplace Validation Warning Create Version">: Warning: creating version folder</string>
 	<string name="Marketplace Validation Warning Move">: Warning : moving items</string>
 	<string name="Marketplace Validation Warning Delete">: Warning: folder content transfered to stock folder, removing empty folder</string>
-	<string name="Marketplace Validation Warning Stock Item">: Warning: no-copy item must be contained by a stock folder</string>
+	<string name="Marketplace Validation Error Stock Item">: Error: no-copy items must be contained by a stock folder</string>
 	<string name="Marketplace Validation Warning Unwrapped Item">: Warning: items must be contained by a version folder</string>
 	<string name="Marketplace Validation Error">: Error: </string>
+	<string name="Marketplace Validation Warning">: Warning: </string>
 	<string name="Marketplace Validation Error Empty Version">: Error: version folder must contain at least 1 item</string>
 	<string name="Marketplace Validation Error Empty Stock">: Error: stock folder must contain at least 1 item</string>
 	<string name="Marketplace Error None">No errors</string>
-- 
cgit v1.2.3


From 3e1a264083b3a874fe2bfd0db58227a595b3940b Mon Sep 17 00:00:00 2001
From: Merov Linden <merov@lindenlab.com>
Date: Wed, 24 Sep 2014 21:16:58 -0700
Subject: DD-196 : Tweak string for empty search result in marketplace

---
 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 f79c8352e1..ec2dfc93d4 100755
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -2259,7 +2259,7 @@ For AI Character: Get the closest navigable point to the point provided.
 	<string name="InventoryNoMatchingItems">Didn't find what you're looking for? Try [secondlife:///app/search/all/[SEARCH_TERM] Search].</string>
 	<string name="PlacesNoMatchingItems">Didn't find what you're looking for? Try [secondlife:///app/search/places/[SEARCH_TERM] Search].</string>
 	<string name="FavoritesNoMatchingItems">Drag a landmark here to add it to your favorites.</string>
-	<string name="MarketplaceNoMatchingItems">No Marketplace Listings item found for this search string.</string>
+	<string name="MarketplaceNoMatchingItems">No items found. Check the spelling of your search string and try again.</string>
 	<string name="InventoryNoTexture">You do not have a copy of this texture in your inventory</string>
 	<string name="InventoryInboxNoItems">Your Marketplace purchases will appear here. You may then drag them into your inventory to use them.</string>
 	<string name="MarketplaceURL">https://marketplace.[MARKETPLACE_DOMAIN_NAME]/</string>
-- 
cgit v1.2.3


From 5bde459c79f65fb4846dd1b24fdfa974e18d529e Mon Sep 17 00:00:00 2001
From: Merov Linden <merov@lindenlab.com>
Date: Wed, 24 Sep 2014 21:44:47 -0700
Subject: DD-174 : Clean up UI strings for Marketplace

---
 indra/newview/skins/default/xui/en/menu_inventory.xml        | 10 +++++-----
 indra/newview/skins/default/xui/en/notifications.xml         |  2 +-
 .../default/xui/en/panel_marketplace_listings_inventory.xml  |  2 +-
 indra/newview/skins/default/xui/en/strings.xml               | 12 ++++++------
 4 files changed, 13 insertions(+), 13 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 5e67cdf501..df85a8c666 100755
--- a/indra/newview/skins/default/xui/en/menu_inventory.xml
+++ b/indra/newview/skins/default/xui/en/menu_inventory.xml
@@ -5,7 +5,7 @@
  name="Popup"
  visible="false">
 	<menu_item_call
-        label="Create Listing"
+        label="Create listing"
         layout="topleft"
         name="Marketplace Create Listing">
 		<menu_item_call.on_click
@@ -13,7 +13,7 @@
         parameter="marketplace_create_listing" />
 	</menu_item_call>
 	<menu_item_call
-        label="Associate Listing"
+        label="Associate listing"
         layout="topleft"
         name="Marketplace Associate Listing">
 		<menu_item_call.on_click
@@ -21,7 +21,7 @@
         parameter="marketplace_associate_listing" />
 	</menu_item_call>
 	<menu_item_call
-        label="Disassociate Listing"
+        label="Unassociate listing"
         layout="topleft"
         name="Marketplace Disassociate Listing">
 		<menu_item_call.on_click
@@ -29,7 +29,7 @@
         parameter="marketplace_disassociate_listing" />
 	</menu_item_call>
 	<menu_item_call
-        label="Get (Refresh) Listing"
+        label="Get (Refresh) listing"
         layout="topleft"
         name="Marketplace Get Listing">
 		<menu_item_call.on_click
@@ -37,7 +37,7 @@
         parameter="marketplace_get_listing" />
 	</menu_item_call>
 	<menu_item_call
-        label="Edit Listing"
+        label="Edit listing"
         layout="topleft"
         name="Marketplace Edit Listing">
 		<menu_item_call.on_click
diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index fd9547fd76..5fad1dc6ba 100755
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -397,7 +397,7 @@ This listing could not be updated.
         icon="alertmodal.tga"
         name="AlertMerchantListingCannotWear"
         type="alertmodal">
-        You can not wear clothes or body parts that are on the Marketplace.
+        You cannot wear clothes or body parts that are in the Marketplace Listings folder.
         <tag>fail</tag>
     </notification>
     
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 16e7fbbfeb..67988f3153 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
@@ -13,7 +13,7 @@
     show_empty_message="true"
     show_root_folder="true"
     start_folder.type="merchant"
-    tool_tip="Drag and drop items here to sell them"
+    tool_tip="Drag and drop items here to list them"
     bg_opaque_color="DkGray2"
     bg_alpha_color="DkGray2"
     background_visible="true"
diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index ec2dfc93d4..948af4401e 100755
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -235,16 +235,16 @@ Please try logging in again in a minute.</string>
 	<string name="TooltipMustSingleDrop">Only a single item can be dragged here</string>
 	<string name="TooltipPrice" value="L$[AMOUNT]: "/>
 
-	<string name="TooltipOutboxDragToWorld">You can not rez items on the marketplace</string>
+	<string name="TooltipOutboxDragToWorld">You can't rez items on the marketplace</string>
 	<string name="TooltipOutboxNoTransfer">One or more of these objects cannot be sold or transferred</string>
 	<string name="TooltipOutboxNotInInventory">You can only put items from your inventory on the marketplace</string>
-	<string name="TooltipOutboxWorn">You can not put items you are wearing on the marketplace</string>
-	<string name="TooltipOutboxLinked">You can not put linked items or folders on the marketplace</string>
-	<string name="TooltipOutboxCallingCard">You can not put calling cards on the marketplace</string>
+	<string name="TooltipOutboxWorn">You can't put items you are wearing on the marketplace</string>
+	<string name="TooltipOutboxLinked">You can't put linked items or folders on the marketplace</string>
+	<string name="TooltipOutboxCallingCard">You can't put calling cards on the marketplace</string>
 	<string name="TooltipOutboxFolderLevels">Depth of nested folders exceeds [AMOUNT]</string>
 	<string name="TooltipOutboxTooManyFolders">Subfolder count exceeds [AMOUNT]</string>
 	<string name="TooltipOutboxTooManyObjects">Item count exceeds [AMOUNT]</string>
-	<string name="TooltipOutboxDragActive">You can't move an active listed listing</string>
+	<string name="TooltipOutboxDragActive">You can't move a listed listing</string>
 	<string name="TooltipOutboxCannotDropOnRoot">You can't drop items on filtered tabs root</string>
 	<string name="TooltipOutboxCannotMoveRoot">You can't move the marketplace listings root folder</string>
 	
@@ -2311,7 +2311,7 @@ The [[MARKETPLACE_CREATE_STORE_URL] Marketplace store] is returning errors.
 	<string name="Marketplace Error Prefix">Error: </string>
 	<string name="Marketplace Error Not Merchant">Before sending items to the Marketplace you will need to set yourself up as a merchant (free of charge).</string>
 	<string name="Marketplace Error Not Accepted">Cannot move item in that folder.</string>
-	<string name="Marketplace Error Unsellable Item">This item can not be sold on the marketplace.</string>
+	<string name="Marketplace Error Unsellable Item">This item cannot be sold on the Marketplace.</string>
 
 	<string name="MarketplaceNoID">no Mkt ID</string>
 	<string name="MarketplaceLive">listed</string>
-- 
cgit v1.2.3


From 896f48229e577b1bcf94f2cb80d73a6bf1a9330c Mon Sep 17 00:00:00 2001
From: Merov Linden <merov@lindenlab.com>
Date: Sun, 28 Sep 2014 17:30:48 -0700
Subject: DD-211 : Verify that the items have the right permissions when
 dropping in a stock folder, add an adequate message when failing to drop in a
 stock folder.

---
 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 948af4401e..773f44fc46 100755
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -247,6 +247,7 @@ Please try logging in again in a minute.</string>
 	<string name="TooltipOutboxDragActive">You can't move a listed listing</string>
 	<string name="TooltipOutboxCannotDropOnRoot">You can't drop items on filtered tabs root</string>
 	<string name="TooltipOutboxCannotMoveRoot">You can't move the marketplace listings root folder</string>
+	<string name="TooltipOutboxMixedStock">All items in a stock folder must have the same type and permission</string>
 	
 	<string name="TooltipDragOntoOwnChild">You can't move a folder into its child</string>
 	<string name="TooltipDragOntoSelf">You can't move a folder into itself</string>
-- 
cgit v1.2.3


From 7c1e92abd767a0e2fe955ba9aefeee70512d3eca Mon Sep 17 00:00:00 2001
From: Merov Linden <merov@lindenlab.com>
Date: Fri, 3 Oct 2014 08:56:32 -0700
Subject: DD-174 : WIP : Change the Audit button from an icon to text

---
 .../skins/default/xui/en/panel_marketplace_listings.xml   | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

(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 1953fae72e..9f319273a8 100755
--- a/indra/newview/skins/default/xui/en/panel_marketplace_listings.xml
+++ b/indra/newview/skins/default/xui/en/panel_marketplace_listings.xml
@@ -42,16 +42,13 @@
       image_unselected="Toolbar_Middle_Off"/>
     <button
       name="audit_btn"
-      tool_tip="Validate your marketplace listings"
+      label="Check for Errors"
+      tool_tip="Check your marketplace listings"
       layout="topleft"
-      follows="top|left"
-      width="31"
-      height="25"
-      left_pad="2"
-      image_hover_unselected="Toolbar_Middle_Over"
-      image_overlay="Info"
-      image_selected="Toolbar_Middle_Selected"
-      image_unselected="Toolbar_Middle_Off"/>
+      follows="top|right"
+      width="97"
+      height="26"
+      left_pad="143"/>
   </panel>
   <panel
     name="tab_container_panel"
-- 
cgit v1.2.3


From 86e16d49b44f7ece4232388ce6f920352d1b5984 Mon Sep 17 00:00:00 2001
From: Merov Linden <merov@lindenlab.com>
Date: Fri, 3 Oct 2014 10:30:38 -0700
Subject: DD-174 : Changed the label of the Marketplace listings FUI button

---
 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 ae8062a9f3..6afba53497 100755
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -3979,7 +3979,7 @@ Try enclosing path to the editor with double quotes.
   <string name="Command_Inventory_Label">Inventory</string>
   <string name="Command_Map_Label">Map</string>
   <string name="Command_Marketplace_Label">Marketplace</string>
-  <string name="Command_MarketplaceListings_Label">Sell on Marketplace</string>
+  <string name="Command_MarketplaceListings_Label">Marketplace</string>
   <string name="Command_MiniMap_Label">Mini-map</string>
   <string name="Command_Move_Label">Walk / run / fly</string>
   <string name="Command_Outbox_Label">Merchant outbox</string>
-- 
cgit v1.2.3


From b2c7fb9aeead8d1c549c0bb96a9a986686a1211d Mon Sep 17 00:00:00 2001
From: Merov Linden <merov@lindenlab.com>
Date: Thu, 23 Oct 2014 19:45:48 -0700
Subject: DD-224, DD-246 : Clean up code when receiving delete notification.
 Display DAMA alert when associating listing

---
 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 990ba2dea3..70f3f86102 100755
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -382,6 +382,18 @@ Initialization with the Marketplace failed because of a system or network error.
         yestext="OK"/>
     </notification>
 
+    <notification
+        icon="alertmodal.tga"
+        name="AlertMerchantAssociateNeedsVersion"
+        type="alertmodal">
+        Before you can activate this listing or edit it on the Marketplace web site, you will need to activate a version folder.
+        <tag>confirm</tag>
+        <usetemplate
+        ignoretext="Alert about version folder requirements when I associate a listing with an existing listing id"
+        name="okignore"
+        yestext="OK"/>
+    </notification>
+
     <notification
         icon="alertmodal.tga"
         name="AlertMerchantListingNotUpdated"
-- 
cgit v1.2.3


From b630544159f1cad8c05a262422bf100d2579c76d Mon Sep 17 00:00:00 2001
From: Merov Linden <merov@lindenlab.com>
Date: Fri, 24 Oct 2014 15:30:50 -0700
Subject: DD-242 : Added beta invitation message to merchants in the
 marketplace listings floater

---
 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 6afba53497..66fe9f2931 100755
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -2287,7 +2287,7 @@ We are accessing your account on the [[MARKETPLACE_CREATE_STORE_URL] Marketplace
 	<string name="InventoryOutboxErrorTitle">Marketplace Errors.</string>
 	<string name="InventoryOutboxErrorTooltip"></string>
 	<string name="InventoryOutboxError">
-The [[MARKETPLACE_CREATE_STORE_URL] Marketplace store] is returning errors.
+This feature is currently in Beta. Please add your name to this [http://goo.gl/forms/FCQ7UXkakz Google form] if you would like to participate.
 	</string>
 	<string name="InventoryMarketplaceListingsNoItemsTitle">Your Marketplace Listings folder is empty.</string>
 	<string name="InventoryMarketplaceListingsNoItemsTooltip"></string>
-- 
cgit v1.2.3


From 48fd1e2ec0a53fb9c572e4542a0f0c7b25bc3c2c Mon Sep 17 00:00:00 2001
From: Merov Linden <merov@lindenlab.com>
Date: Sat, 8 Nov 2014 13:42:07 -0800
Subject: DD-265, DD-266 : Validate the listing id when associating, show alert
 if value out of positive integer limit

---
 indra/newview/skins/default/xui/en/notifications.xml | 8 ++++++++
 1 file changed, 8 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 70f3f86102..06aafe45e4 100755
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -413,6 +413,14 @@ This listing could not be updated.
         <tag>fail</tag>
     </notification>
     
+    <notification
+        icon="alertmodal.tga"
+        name="AlertMerchantListingInvalidID"
+        type="alertmodal">
+        Invalid listing ID.
+        <tag>fail</tag>
+    </notification>
+    
     <notification
    icon="alertmodal.tga"
    name="CompileQueueSaveText"
-- 
cgit v1.2.3


From 43745ce2714eca8dce95e08a89eeb3c278b0be3f Mon Sep 17 00:00:00 2001
From: Merov Linden <merov@lindenlab.com>
Date: Sun, 16 Nov 2014 14:26:33 -0800
Subject: DD-281 : Do not unlist listings that go out of stock

---
 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 66fe9f2931..892aed390a 100755
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -2308,7 +2308,7 @@ This feature is currently in Beta. Please add your name to this [http://goo.gl/f
 	<string name="Marketplace Validation Error">: Error: </string>
 	<string name="Marketplace Validation Warning">: Warning: </string>
 	<string name="Marketplace Validation Error Empty Version">: Error: version folder must contain at least 1 item</string>
-	<string name="Marketplace Validation Error Empty Stock">: Error: stock folder must contain at least 1 item</string>
+	<string name="Marketplace Validation Error Empty Stock">: Warning: stock folder must contain at least 1 item</string>
 	<string name="Marketplace Error None">No errors</string>
 	<string name="Marketplace Error Prefix">Error: </string>
 	<string name="Marketplace Error Not Merchant">Before sending items to the Marketplace you will need to set yourself up as a merchant (free of charge).</string>
-- 
cgit v1.2.3


From 3513633d86b89127e8d19cc5906ab614bb051560 Mon Sep 17 00:00:00 2001
From: Merov Linden <merov@lindenlab.com>
Date: Tue, 18 Nov 2014 14:54:36 -0800
Subject: DD-264 : Do not unlist listings when version folder is emptied

---
 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 892aed390a..fa9c1f5168 100755
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -2307,7 +2307,7 @@ This feature is currently in Beta. Please add your name to this [http://goo.gl/f
 	<string name="Marketplace Validation Warning Unwrapped Item">: Warning: items must be contained by a version folder</string>
 	<string name="Marketplace Validation Error">: Error: </string>
 	<string name="Marketplace Validation Warning">: Warning: </string>
-	<string name="Marketplace Validation Error Empty Version">: Error: version folder must contain at least 1 item</string>
+	<string name="Marketplace Validation Error Empty Version">: Warning: version folder must contain at least 1 item</string>
 	<string name="Marketplace Validation Error Empty Stock">: Warning: stock folder must contain at least 1 item</string>
 	<string name="Marketplace Error None">No errors</string>
 	<string name="Marketplace Error Prefix">Error: </string>
-- 
cgit v1.2.3


From 072ac0e5a66b43d345d1767055518e8ce1b66a43 Mon Sep 17 00:00:00 2001
From: Merov Linden <merov@lindenlab.com>
Date: Sun, 23 Nov 2014 17:04:02 -0800
Subject: DD-286 : We report if a stock folder contains subfolders, we do not
 count subfolders in stock count and we move subfolders out on drop

---
 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 fa9c1f5168..5db178a556 100755
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -2298,6 +2298,7 @@ This feature is currently in Beta. Please add your name to this [http://goo.gl/f
 	<string name="Marketplace Validation Log"></string>
 	<string name="Marketplace Validation Warning Stock">stock folder must be contained by a version folder</string>
 	<string name="Marketplace Validation Error Mixed Stock">: Error: all items in a stock folder must be no-copy and of the same type</string>
+	<string name="Marketplace Validation Error Subfolder In Stock">: Error: stock folder cannot contain subfolders</string>
 	<string name="Marketplace Validation Warning Empty">: Warning: folder doesn't contain any items</string>
 	<string name="Marketplace Validation Warning Create Stock">: Warning: creating stock folder</string>
 	<string name="Marketplace Validation Warning Create Version">: Warning: creating version folder</string>
-- 
cgit v1.2.3


From d0d5a6a15cf3c573c89ce590030c7a150b19dd05 Mon Sep 17 00:00:00 2001
From: Merov Linden <merov@lindenlab.com>
Date: Thu, 18 Dec 2014 22:16:44 -0800
Subject: DD-286 : Made stock folders in inventory do checking on paste and
 drop. Also prevent creation of items in stock folders

---
 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 06aafe45e4..cce166a8bd 100755
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -303,6 +303,19 @@ Initialization with the Marketplace failed because of a system or network error.
          yestext="OK"/>
   </notification>
 
+    <notification
+        icon="OutboxStatus_Error"
+        name="StockPasteFailed"
+        type="outbox">
+        Copy or move to Stock Folder failed with error :
+        
+        &apos;[ERROR_CODE]&apos;
+        
+        <usetemplate
+        name="okbutton"
+        yestext="OK"/>
+    </notification>
+    
     <notification
         icon="OutboxStatus_Error"
         name="MerchantPasteFailed"
-- 
cgit v1.2.3


From e8ea398e123be29227275e8ca5b1d2d0ce7f1e4f Mon Sep 17 00:00:00 2001
From: Merov Linden <merov@lindenlab.com>
Date: Mon, 22 Dec 2014 16:33:47 -0800
Subject: DD-282 : Suppress Unassociate menu item. Confirm when cutting,
 deleting or moving a listing

---
 indra/newview/skins/default/xui/en/menu_inventory.xml |  8 --------
 indra/newview/skins/default/xui/en/notifications.xml  | 13 +++++++++++++
 2 files changed, 13 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 e28a02550f..63f408c05c 100755
--- a/indra/newview/skins/default/xui/en/menu_inventory.xml
+++ b/indra/newview/skins/default/xui/en/menu_inventory.xml
@@ -21,14 +21,6 @@
         parameter="marketplace_associate_listing" />
 	</menu_item_call>
 	<menu_item_call
-        label="Unassociate listing"
-        layout="topleft"
-        name="Marketplace Disassociate Listing">
-		<menu_item_call.on_click
-        function="Inventory.DoToSelected"
-        parameter="marketplace_disassociate_listing" />
-	</menu_item_call>
-	<menu_item_call
         label="Get (Refresh) listing"
         layout="topleft"
         name="Marketplace Get Listing">
diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index 5b0bdc4a0d..4d856ed8a7 100755
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -369,6 +369,19 @@ Initialization with the Marketplace failed because of a system or network error.
         yestext="OK"/>
     </notification>
 
+    <notification
+        icon="alertmodal.tga"
+        name="ConfirmListingCutOrDelete"
+        type="alertmodal">
+        Moving or deleting a listing folder will delete your Marketplace listing. If you would like to keep the Marketplace listing, move or delete the contents of the version folder you would like to modify. Do you want to continue?
+        <tag>confirm</tag>
+        <usetemplate
+        ignoretext="Confirm before I move or delete a listing from the marketplace"
+        name="okcancelignore"
+        notext="Cancel"
+        yestext="OK"/>
+    </notification>
+    
     <notification
         icon="alertmodal.tga"
         name="ConfirmMerchantUnlist"
-- 
cgit v1.2.3


From ddb9d0eeadd9d73a2719dbec2feb9c9226e2f00e Mon Sep 17 00:00:00 2001
From: Merov Linden <merov@lindenlab.com>
Date: Fri, 26 Dec 2014 10:40:41 -0800
Subject: DD-296 : Added contextual menu items to copy and move to the
 marketplace. Hide copy to merchant outbox. Message when moving to the
 marketplace.

---
 indra/newview/skins/default/xui/en/menu_inventory.xml | 16 ++++++++++++++++
 indra/newview/skins/default/xui/en/notifications.xml  | 13 +++++++++++++
 2 files changed, 29 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 63f408c05c..4187bf9d47 100755
--- a/indra/newview/skins/default/xui/en/menu_inventory.xml
+++ b/indra/newview/skins/default/xui/en/menu_inventory.xml
@@ -785,6 +785,22 @@
 		 parameter="copy_to_outbox" />
 	</menu_item_call>
 	<menu_item_call
+        label="Copy to Marketplace Listings"
+        layout="topleft"
+        name="Marketplace Copy">
+		<menu_item_call.on_click
+        function="Inventory.DoToSelected"
+        parameter="copy_to_marketplace_listings" />
+	</menu_item_call>
+	<menu_item_call
+        label="Move to Marketplace Listings"
+        layout="topleft"
+        name="Marketplace Move">
+		<menu_item_call.on_click
+        function="Inventory.DoToSelected"
+        parameter="move_to_marketplace_listings" />
+	</menu_item_call>
+	<menu_item_call
      label="--no options--"
      layout="topleft"
      name="--no options--" />
diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index 4d856ed8a7..bb7f296285 100755
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -369,6 +369,19 @@ Initialization with the Marketplace failed because of a system or network error.
         yestext="OK"/>
     </notification>
 
+    <notification
+        icon="alertmodal.tga"
+        name="ConfirmMerchantMoveInventory"
+        type="alertmodal">
+        Items dragged to the Marketplace Items window are moved from their original locations, not copied. Do you want to continue?
+        <tag>confirm</tag>
+        <usetemplate
+        ignoretext="Confirm before I move an item from the inventory to the marketplace"
+        name="okcancelignore"
+        notext="Cancel"
+        yestext="OK"/>
+    </notification>
+    
     <notification
         icon="alertmodal.tga"
         name="ConfirmListingCutOrDelete"
-- 
cgit v1.2.3


From edbd73b8364f66bfce24701db5cb160ecc89e37d Mon Sep 17 00:00:00 2001
From: Merov Linden <merov@lindenlab.com>
Date: Fri, 26 Dec 2014 17:37:48 -0800
Subject: DD-296 : Prompt the user when trying to copy a selection containing
 nocopy items to the marketplace

---
 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 bb7f296285..6c97772d85 100755
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -395,6 +395,19 @@ Initialization with the Marketplace failed because of a system or network error.
         yestext="OK"/>
     </notification>
     
+    <notification
+        icon="alertmodal.tga"
+        name="ConfirmCopyToMarketplace"
+        type="alertmodal">
+        No copy items contained in that selection will not be copied to the Marketplace. Do you want to continue?
+        <tag>confirm</tag>
+        <usetemplate
+        ignoretext="Confirm before I try to copy a selection containing no copy items to the marketplace"
+        name="okcancelignore"
+        notext="Cancel"
+        yestext="OK"/>
+    </notification>
+    
     <notification
         icon="alertmodal.tga"
         name="ConfirmMerchantUnlist"
-- 
cgit v1.2.3


From 8de34ade3d40a4a174c135609284a52b342b0624 Mon Sep 17 00:00:00 2001
From: Merov Linden <merov@lindenlab.com>
Date: Mon, 29 Dec 2014 13:56:03 -0800
Subject: DD-298 : Do not show beta notice in Merchant Outbox panel on error

---
 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 0b4bbf0105..6e4ab3067c 100755
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -2287,6 +2287,9 @@ We are accessing your account on the [[MARKETPLACE_CREATE_STORE_URL] Marketplace
 	<string name="InventoryOutboxErrorTitle">Marketplace Errors.</string>
 	<string name="InventoryOutboxErrorTooltip"></string>
 	<string name="InventoryOutboxError">
+The [[MARKETPLACE_CREATE_STORE_URL] Marketplace store] is returning errors.
+	</string>
+	<string name="InventoryMarketplaceError">
 This feature is currently in Beta. Please add your name to this [http://goo.gl/forms/FCQ7UXkakz Google form] if you would like to participate.
 	</string>
 	<string name="InventoryMarketplaceListingsNoItemsTitle">Your Marketplace Listings folder is empty.</string>
-- 
cgit v1.2.3


From 618e13a2d6c5bd632892865fc3b88051c13a7658 Mon Sep 17 00:00:00 2001
From: Merov Linden <merov@lindenlab.com>
Date: Fri, 2 Jan 2015 17:35:50 -0800
Subject: DD-297 : Performance on login : Refactored the code so that we have a
 new LLMarketplaceFolderBridge class in the bridge model. Only the panels with
 the use_marketplace_folders param flag will use that one.

---
 .../skins/default/xui/en/panel_marketplace_listings_inventory.xml        | 1 +
 indra/newview/skins/default/xui/en/panel_marketplace_listings_listed.xml | 1 +
 .../skins/default/xui/en/panel_marketplace_listings_unassociated.xml     | 1 +
 .../newview/skins/default/xui/en/panel_marketplace_listings_unlisted.xml | 1 +
 4 files changed, 4 insertions(+)

(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 67988f3153..567e5e2724 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
@@ -12,6 +12,7 @@
     start_folder.name="Marketplace listings"
     show_empty_message="true"
     show_root_folder="true"
+    use_marketplace_folders="true"
     start_folder.type="merchant"
     tool_tip="Drag and drop items here to list them"
     bg_opaque_color="DkGray2"
diff --git a/indra/newview/skins/default/xui/en/panel_marketplace_listings_listed.xml b/indra/newview/skins/default/xui/en/panel_marketplace_listings_listed.xml
index 181eee70e2..668be27bdc 100755
--- a/indra/newview/skins/default/xui/en/panel_marketplace_listings_listed.xml
+++ b/indra/newview/skins/default/xui/en/panel_marketplace_listings_listed.xml
@@ -11,6 +11,7 @@
     start_folder.name="Marketplace listings"
     show_empty_message="true"
     show_root_folder="true"
+    use_marketplace_folders="true"
     allow_drop_on_root="false"
     start_folder.type="merchant"
     bg_opaque_color="DkGray2"
diff --git a/indra/newview/skins/default/xui/en/panel_marketplace_listings_unassociated.xml b/indra/newview/skins/default/xui/en/panel_marketplace_listings_unassociated.xml
index 6ea4784c4c..0015c85aa2 100755
--- a/indra/newview/skins/default/xui/en/panel_marketplace_listings_unassociated.xml
+++ b/indra/newview/skins/default/xui/en/panel_marketplace_listings_unassociated.xml
@@ -11,6 +11,7 @@
     start_folder.name="Marketplace listings"
     show_empty_message="true"
     show_root_folder="true"
+    use_marketplace_folders="true"
     start_folder.type="merchant"
     bg_opaque_color="DkGray2"
     bg_alpha_color="DkGray2"
diff --git a/indra/newview/skins/default/xui/en/panel_marketplace_listings_unlisted.xml b/indra/newview/skins/default/xui/en/panel_marketplace_listings_unlisted.xml
index 0d19d09918..ec9c176811 100755
--- a/indra/newview/skins/default/xui/en/panel_marketplace_listings_unlisted.xml
+++ b/indra/newview/skins/default/xui/en/panel_marketplace_listings_unlisted.xml
@@ -11,6 +11,7 @@
     start_folder.name="Marketplace listings"
     show_empty_message="true"
     show_root_folder="true"
+    use_marketplace_folders="true"
     allow_drop_on_root="false"
     start_folder.type="merchant"
     bg_opaque_color="DkGray2"
-- 
cgit v1.2.3


From 162d33dec4444c97837eba7e64eff964389d5987 Mon Sep 17 00:00:00 2001
From: Merov Linden <merov@lindenlab.com>
Date: Thu, 15 Jan 2015 22:22:22 -0800
Subject: DD-303 : Auto activate version folder when only one present on
 creation or association

---
 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 6c97772d85..75be55061f 100755
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -473,6 +473,18 @@ This listing could not be updated.
         <tag>fail</tag>
     </notification>
     
+    <notification
+        icon="alertmodal.tga"
+        name="AlertMerchantListingActivateRequired"
+        type="alertmodal">
+        There are several or no version folders in this listing. You will need to select and activate one independently later.
+        <tag>confirm</tag>
+        <usetemplate
+        ignoretext="Alert about version folder activation when I create a listing with several version folders"
+        name="okignore"
+        yestext="OK"/>
+    </notification>
+
     <notification
    icon="alertmodal.tga"
    name="CompileQueueSaveText"
-- 
cgit v1.2.3


From 88dca882ae04b6c4bf8fcffda897684505756f54 Mon Sep 17 00:00:00 2001
From: Merov Linden <merov@lindenlab.com>
Date: Sat, 17 Jan 2015 22:23:17 -0800
Subject: DD-300 : WIP : Add drop zone to marketplace (XUI work)

---
 .../default/xui/en/panel_marketplace_listings.xml  | 34 ++++++++++++++++++++--
 1 file changed, 32 insertions(+), 2 deletions(-)

(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 9f319273a8..68d75440bd 100755
--- a/indra/newview/skins/default/xui/en/panel_marketplace_listings.xml
+++ b/indra/newview/skins/default/xui/en/panel_marketplace_listings.xml
@@ -56,7 +56,7 @@
     layout="topleft"
     default_tab_group="1"
     width="308"
-    height="400">
+    height="350">
   <filter_editor
     text_pad_left="10"
     follows="left|top|right"
@@ -76,7 +76,7 @@
     left="0"
     top_pad="0"
     width="308"
-    height="370"
+    height="320"
     halign="center"
     tab_height="30"
     tab_group="1"
@@ -84,4 +84,34 @@
     tab_min_width="50">
   </tab_container>
   </panel>
+  <panel
+      name="marketplace_drop_zone"
+      mouse_opaque="false"
+      follows="bottom|left|right"
+      left="2"
+      width="306"
+      height="40"
+      background_visible="true"
+      background_opaque="true"
+      bg_alpha_image="none"
+      bg_alpha_color="EmphasisColor_35"
+      bg_opaque_image="Marketplace_Dropzone_Background"
+      border="true"
+      bevel_style="in"
+      visible="true">
+      <text
+          type="string"
+          follows="bottom|left|right"
+          layout="topleft"
+          top="13"
+          height="20"
+          left="2"
+          width="306"
+          halign="center"
+          font="SansSerifMedium"
+          font_shadow="hard"
+          valign="top">
+          Drop folders here to create new listings
+      </text>
+  </panel>
 </panel>
\ No newline at end of file
-- 
cgit v1.2.3


From 8cb399e3e547748258486ce93bb9720452a76b10 Mon Sep 17 00:00:00 2001
From: Merov Linden <merov@lindenlab.com>
Date: Mon, 19 Jan 2015 20:50:47 -0800
Subject: DD-300 : Drop zone added to marketplace folder

---
 .../skins/default/xui/en/panel_marketplace_listings_inventory.xml       | 2 +-
 .../newview/skins/default/xui/en/panel_marketplace_listings_listed.xml  | 2 +-
 .../skins/default/xui/en/panel_marketplace_listings_unassociated.xml    | 2 +-
 .../skins/default/xui/en/panel_marketplace_listings_unlisted.xml        | 2 +-
 4 files changed, 4 insertions(+), 4 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 567e5e2724..8d5fa265e2 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
@@ -11,7 +11,7 @@
     left="0"
     start_folder.name="Marketplace listings"
     show_empty_message="true"
-    show_root_folder="true"
+    show_root_folder="false"
     use_marketplace_folders="true"
     start_folder.type="merchant"
     tool_tip="Drag and drop items here to list them"
diff --git a/indra/newview/skins/default/xui/en/panel_marketplace_listings_listed.xml b/indra/newview/skins/default/xui/en/panel_marketplace_listings_listed.xml
index 668be27bdc..44f507ad84 100755
--- a/indra/newview/skins/default/xui/en/panel_marketplace_listings_listed.xml
+++ b/indra/newview/skins/default/xui/en/panel_marketplace_listings_listed.xml
@@ -10,7 +10,7 @@
     left_delta="0"
     start_folder.name="Marketplace listings"
     show_empty_message="true"
-    show_root_folder="true"
+    show_root_folder="false"
     use_marketplace_folders="true"
     allow_drop_on_root="false"
     start_folder.type="merchant"
diff --git a/indra/newview/skins/default/xui/en/panel_marketplace_listings_unassociated.xml b/indra/newview/skins/default/xui/en/panel_marketplace_listings_unassociated.xml
index 0015c85aa2..871e8773c4 100755
--- a/indra/newview/skins/default/xui/en/panel_marketplace_listings_unassociated.xml
+++ b/indra/newview/skins/default/xui/en/panel_marketplace_listings_unassociated.xml
@@ -10,7 +10,7 @@
     left_delta="0"
     start_folder.name="Marketplace listings"
     show_empty_message="true"
-    show_root_folder="true"
+    show_root_folder="false"
     use_marketplace_folders="true"
     start_folder.type="merchant"
     bg_opaque_color="DkGray2"
diff --git a/indra/newview/skins/default/xui/en/panel_marketplace_listings_unlisted.xml b/indra/newview/skins/default/xui/en/panel_marketplace_listings_unlisted.xml
index ec9c176811..98bef04aa7 100755
--- a/indra/newview/skins/default/xui/en/panel_marketplace_listings_unlisted.xml
+++ b/indra/newview/skins/default/xui/en/panel_marketplace_listings_unlisted.xml
@@ -10,7 +10,7 @@
     left_delta="0"
     start_folder.name="Marketplace listings"
     show_empty_message="true"
-    show_root_folder="true"
+    show_root_folder="false"
     use_marketplace_folders="true"
     allow_drop_on_root="false"
     start_folder.type="merchant"
-- 
cgit v1.2.3


From 96172ddfe6325862c690b062592fa6cd4f4d5d6c Mon Sep 17 00:00:00 2001
From: Merov Linden <merov@lindenlab.com>
Date: Sat, 24 Jan 2015 11:48:43 -0800
Subject: DD-306 : WIP : Add Check Listing to menu to audit listings
 individually

---
 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 4187bf9d47..2f9742f1fe 100755
--- a/indra/newview/skins/default/xui/en/menu_inventory.xml
+++ b/indra/newview/skins/default/xui/en/menu_inventory.xml
@@ -29,6 +29,14 @@
         parameter="marketplace_get_listing" />
 	</menu_item_call>
 	<menu_item_call
+        label="Check listing"
+        layout="topleft"
+        name="Marketplace Check Listing">
+		<menu_item_call.on_click
+        function="Inventory.DoToSelected"
+        parameter="marketplace_check_listing" />
+	</menu_item_call>
+	<menu_item_call
         label="Edit listing"
         layout="topleft"
         name="Marketplace Edit Listing">
-- 
cgit v1.2.3


From 6cf5912fd0339d09d9ac441d02c2dade824802ac Mon Sep 17 00:00:00 2001
From: Merov Linden <merov@lindenlab.com>
Date: Sat, 24 Jan 2015 16:50:56 -0800
Subject: DD-306 : Suppress no issue listings from audit listing dump, add no
 error message when no error, disable some right click menu items in
 multiselection cases

---
 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 6e4ab3067c..fe2112728d 100755
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -2313,6 +2313,7 @@ This feature is currently in Beta. Please add your name to this [http://goo.gl/f
 	<string name="Marketplace Validation Warning">: Warning: </string>
 	<string name="Marketplace Validation Error Empty Version">: Warning: version folder must contain at least 1 item</string>
 	<string name="Marketplace Validation Error Empty Stock">: Warning: stock folder must contain at least 1 item</string>
+	<string name="Marketplace Validation No Error">No error or warning to report</string>
 	<string name="Marketplace Error None">No errors</string>
 	<string name="Marketplace Error Prefix">Error: </string>
 	<string name="Marketplace Error Not Merchant">Before sending items to the Marketplace you will need to set yourself up as a merchant (free of charge).</string>
-- 
cgit v1.2.3


From 855696c36980ded4aa93c315e1cd3d7e2b278446 Mon Sep 17 00:00:00 2001
From: Merov Linden <merov@lindenlab.com>
Date: Sat, 24 Jan 2015 17:30:05 -0800
Subject: DD-303 : Suppress message on activation when associating since we
 auto activate or have another message

---
 indra/newview/skins/default/xui/en/notifications.xml | 12 ------------
 1 file changed, 12 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 75be55061f..4173c8b0d7 100755
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -434,18 +434,6 @@ Initialization with the Marketplace failed because of a system or network error.
         yestext="OK"/>
     </notification>
 
-    <notification
-        icon="alertmodal.tga"
-        name="AlertMerchantAssociateNeedsVersion"
-        type="alertmodal">
-        Before you can activate this listing or edit it on the Marketplace web site, you will need to activate a version folder.
-        <tag>confirm</tag>
-        <usetemplate
-        ignoretext="Alert about version folder requirements when I associate a listing with an existing listing id"
-        name="okignore"
-        yestext="OK"/>
-    </notification>
-
     <notification
         icon="alertmodal.tga"
         name="AlertMerchantListingNotUpdated"
-- 
cgit v1.2.3


From a62b1a26f5fcc88fa00c90075fa3c02b1f611e4c Mon Sep 17 00:00:00 2001
From: Merov Linden <merov@lindenlab.com>
Date: Sat, 24 Jan 2015 20:56:24 -0800
Subject: DD-301 : Add show only listing folders as an optional filter

---
 indra/newview/skins/default/xui/en/menu_marketplace_view.xml | 10 ++++++++++
 1 file changed, 10 insertions(+)

(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 cff5ec1040..a9e9b5a28f 100755
--- a/indra/newview/skins/default/xui/en/menu_marketplace_view.xml
+++ b/indra/newview/skins/default/xui/en/menu_marketplace_view.xml
@@ -13,4 +13,14 @@
          function="Marketplace.ViewSort.CheckItem"
          parameter="sort_by_stock_amount"/>
     </menu_item_check>
+    <menu_item_check
+        label="Show only listing folders"
+        name="show_only_listing_folders">
+        <menu_item_check.on_click
+        function="Marketplace.ViewSort.Action"
+        parameter="show_only_listing_folders"/>
+        <menu_item_check.on_check
+        function="Marketplace.ViewSort.CheckItem"
+        parameter="show_only_listing_folders"/>
+    </menu_item_check>
 </toggleable_menu>
-- 
cgit v1.2.3


From 4fdaa7fc561e9e05751373160434a61151c2b75e Mon Sep 17 00:00:00 2001
From: Merov Linden <merov@lindenlab.com>
Date: Sun, 25 Jan 2015 17:10:05 -0800
Subject: DD-296 : Disable move and copy to marketplace if limit passed.
 Improve perf of validate_marketplaceting(). Open marketplace floater on copy
 or move. String fix.

---
 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 4173c8b0d7..89aa69cfb4 100755
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -373,7 +373,7 @@ Initialization with the Marketplace failed because of a system or network error.
         icon="alertmodal.tga"
         name="ConfirmMerchantMoveInventory"
         type="alertmodal">
-        Items dragged to the Marketplace Items window are moved from their original locations, not copied. Do you want to continue?
+        Items dragged to the Marketplace Listings window are moved from their original locations, not copied. Do you want to continue?
         <tag>confirm</tag>
         <usetemplate
         ignoretext="Confirm before I move an item from the inventory to the marketplace"
-- 
cgit v1.2.3


From f1c9536401016052bbee84c6ff178fa0d466bc78 Mon Sep 17 00:00:00 2001
From: Merov Linden <merov@lindenlab.com>
Date: Tue, 27 Jan 2015 23:19:51 -0800
Subject: DD-296 : Add options to move or leave behind no copy items when
 copying a folder to the marketplace

---
 indra/newview/skins/default/xui/en/notifications.xml | 9 +++++----
 1 file changed, 5 insertions(+), 4 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 89aa69cfb4..4c6a61adfd 100755
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -399,13 +399,14 @@ Initialization with the Marketplace failed because of a system or network error.
         icon="alertmodal.tga"
         name="ConfirmCopyToMarketplace"
         type="alertmodal">
-        No copy items contained in that selection will not be copied to the Marketplace. Do you want to continue?
+        You don't have permission to copy one or more of these items to the Marketplace. You can move them or leave them behind.
         <tag>confirm</tag>
         <usetemplate
         ignoretext="Confirm before I try to copy a selection containing no copy items to the marketplace"
-        name="okcancelignore"
-        notext="Cancel"
-        yestext="OK"/>
+        name="yesnocancelbuttons"
+        yestext="Move item(s)"
+        notext="Don't move item(s)"
+        canceltext="Cancel"/>
     </notification>
     
     <notification
-- 
cgit v1.2.3


From 8ceb2f1bbadd5eca894117ccc90b637fa8a10c1a Mon Sep 17 00:00:00 2001
From: Merov Linden <merov@lindenlab.com>
Date: Wed, 28 Jan 2015 09:59:18 -0800
Subject: DD-306 : Menu item string change

---
 indra/newview/skins/default/xui/en/menu_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/menu_inventory.xml b/indra/newview/skins/default/xui/en/menu_inventory.xml
index 2f9742f1fe..91adec0789 100755
--- a/indra/newview/skins/default/xui/en/menu_inventory.xml
+++ b/indra/newview/skins/default/xui/en/menu_inventory.xml
@@ -29,7 +29,7 @@
         parameter="marketplace_get_listing" />
 	</menu_item_call>
 	<menu_item_call
-        label="Check listing"
+        label="Check for errors"
         layout="topleft"
         name="Marketplace Check Listing">
 		<menu_item_call.on_click
-- 
cgit v1.2.3


From 03f18a55b7836c22470033267e69f267eb1a8d18 Mon Sep 17 00:00:00 2001
From: Merov Linden <merov@lindenlab.com>
Date: Wed, 28 Jan 2015 22:16:47 -0800
Subject: DD-320 : Special case HTTP error 422 on the Marketplace and give it a
 nicer error dialog

---
 indra/newview/skins/default/xui/en/notifications.xml | 11 +++++++++++
 1 file changed, 11 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 4c6a61adfd..570a69256d 100755
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -343,6 +343,17 @@ Initialization with the Marketplace failed because of a system or network error.
         yestext="OK"/>
     </notification>
     
+    <notification
+        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.
+        
+        <usetemplate
+        name="okbutton"
+        yestext="OK"/>
+    </notification>
+
     <notification
         icon="OutboxStatus_Error"
         name="MerchantListingFailed"
-- 
cgit v1.2.3


From 2377eba9874a89b84319ba38b05408ebcbf9155f Mon Sep 17 00:00:00 2001
From: Merov Linden <merov@lindenlab.com>
Date: Sat, 31 Jan 2015 13:49:28 -0800
Subject: DD-319 : Fix wording in some error messages and tooltips

---
 indra/newview/skins/default/xui/en/strings.xml | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 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 fe2112728d..76f4de1400 100755
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -236,17 +236,17 @@ Please try logging in again in a minute.</string>
 	<string name="TooltipTooManyWearables">You can't wear a folder containing more than [AMOUNT] items.  You can change this limit in Advanced > Show Debug Settings > WearFolderLimit.</string>
 	<string name="TooltipPrice" value="L$[AMOUNT]: "/>
 
-	<string name="TooltipOutboxDragToWorld">You can't rez items on the marketplace</string>
+    <string name="TooltipOutboxDragToWorld">You can't rez items from the Marketplace Listings folder</string>
+    <string name="TooltipOutboxWorn">You can't put items you are wearing in the Marketplace Listings folder</string>
+    <string name="TooltipOutboxFolderLevels">Depth of nested folders exceeds [AMOUNT]. Decrease the depth of folders-within-folders; box items if necessary.</string>
+    <string name="TooltipOutboxTooManyFolders">Subfolder count exceeds [AMOUNT]. Decrease the number of folders in your listing; box items if necessary.</string>
+    <string name="TooltipOutboxTooManyObjects">Item count exceeds [AMOUNT]. In order to sell more than [AMOUNT] items in one listing, you must box some of them.</string>
+    <string name="TooltipOutboxCannotDropOnRoot">You can only drop items or folders in the ALL tab. Please select that tab and move your item(s) or folder(s) again.</string>
 	<string name="TooltipOutboxNoTransfer">One or more of these objects cannot be sold or transferred</string>
 	<string name="TooltipOutboxNotInInventory">You can only put items from your inventory on the marketplace</string>
-	<string name="TooltipOutboxWorn">You can't put items you are wearing on the marketplace</string>
 	<string name="TooltipOutboxLinked">You can't put linked items or folders on the marketplace</string>
 	<string name="TooltipOutboxCallingCard">You can't put calling cards on the marketplace</string>
-	<string name="TooltipOutboxFolderLevels">Depth of nested folders exceeds [AMOUNT]</string>
-	<string name="TooltipOutboxTooManyFolders">Subfolder count exceeds [AMOUNT]</string>
-	<string name="TooltipOutboxTooManyObjects">Item count exceeds [AMOUNT]</string>
 	<string name="TooltipOutboxDragActive">You can't move a listed listing</string>
-	<string name="TooltipOutboxCannotDropOnRoot">You can't drop items on filtered tabs root</string>
 	<string name="TooltipOutboxCannotMoveRoot">You can't move the marketplace listings root folder</string>
 	<string name="TooltipOutboxMixedStock">All items in a stock folder must have the same type and permission</string>
 	
@@ -2313,7 +2313,8 @@ This feature is currently in Beta. Please add your name to this [http://goo.gl/f
 	<string name="Marketplace Validation Warning">: Warning: </string>
 	<string name="Marketplace Validation Error Empty Version">: Warning: version folder must contain at least 1 item</string>
 	<string name="Marketplace Validation Error Empty Stock">: Warning: stock folder must contain at least 1 item</string>
-	<string name="Marketplace Validation No Error">No error or warning to report</string>
+
+    <string name="Marketplace Validation No Error">No errors or warnings to report</string>
 	<string name="Marketplace Error None">No errors</string>
 	<string name="Marketplace Error Prefix">Error: </string>
 	<string name="Marketplace Error Not Merchant">Before sending items to the Marketplace you will need to set yourself up as a merchant (free of charge).</string>
-- 
cgit v1.2.3


From 626d465894b0147b9cbefb15f7cfd8db38d72f00 Mon Sep 17 00:00:00 2001
From: Merov Linden <merov@lindenlab.com>
Date: Sat, 31 Jan 2015 20:47:40 -0800
Subject: DD-321 : Fix the drop zone to react really on the drop zone

---
 indra/newview/skins/default/xui/en/panel_marketplace_listings.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.xml b/indra/newview/skins/default/xui/en/panel_marketplace_listings.xml
index 68d75440bd..2b17473a84 100755
--- a/indra/newview/skins/default/xui/en/panel_marketplace_listings.xml
+++ b/indra/newview/skins/default/xui/en/panel_marketplace_listings.xml
@@ -86,7 +86,7 @@
   </panel>
   <panel
       name="marketplace_drop_zone"
-      mouse_opaque="false"
+      mouse_opaque="true"
       follows="bottom|left|right"
       left="2"
       width="306"
-- 
cgit v1.2.3


From 9ce64ec527f7b49b1641753ce6e67b8ed7f603c7 Mon Sep 17 00:00:00 2001
From: Merov Linden <merov@lindenlab.com>
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"/>
     </notification>
 
+    <notification
+        icon="alertmodal.tga"
+        name="AlertMerchantStockFolderSplit"
+        type="alertmodal">
+        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.
+        <tag>confirm</tag>
+        <usetemplate
+        ignoretext="Alert when stock folder is being split before being listed"
+        name="okignore"
+        yestext="OK"/>
+    </notification>
+    
     <notification
    icon="alertmodal.tga"
    name="CompileQueueSaveText"
-- 
cgit v1.2.3


From df918447b7f804bb02f81ebc6f5f22babc8bb2d1 Mon Sep 17 00:00:00 2001
From: Merov Linden <merov@lindenlab.com>
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">
-  <string name="MarketplaceListingsInitializing">Initializing...</string>
   <panel
     name="marketplace_listings_panel"
     follows="all"
-- 
cgit v1.2.3


From c7f24a69cfa0e87160d98325431c3098dcd8295b Mon Sep 17 00:00:00 2001
From: Merov Linden <merov@lindenlab.com>
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.</string>
     <string name="TooltipOutboxFolderLevels">Depth of nested folders exceeds [AMOUNT]. Decrease the depth of folders-within-folders; box items if necessary.</string>
     <string name="TooltipOutboxTooManyFolders">Subfolder count exceeds [AMOUNT]. Decrease the number of folders in your listing; box items if necessary.</string>
     <string name="TooltipOutboxTooManyObjects">Item count exceeds [AMOUNT]. In order to sell more than [AMOUNT] items in one listing, you must box some of them.</string>
+    <string name="TooltipOutboxTooManyStockItems">Stock folder count exceeds [AMOUNT].</string>
     <string name="TooltipOutboxCannotDropOnRoot">You can only drop items or folders in the ALL tab. Please select that tab and move your item(s) or folder(s) again.</string>
 	<string name="TooltipOutboxNoTransfer">One or more of these objects cannot be sold or transferred</string>
 	<string name="TooltipOutboxNotInInventory">You can only put items from your inventory on the marketplace</string>
-- 
cgit v1.2.3


From 7e2a449b4e5bd2beeff1c6543e4f893fc38f0fe8 Mon Sep 17 00:00:00 2001
From: Merov Linden <merov@lindenlab.com>
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.</string>
     <string name="TooltipOutboxFolderLevels">Depth of nested folders exceeds [AMOUNT]. Decrease the depth of folders-within-folders; box items if necessary.</string>
     <string name="TooltipOutboxTooManyFolders">Subfolder count exceeds [AMOUNT]. Decrease the number of folders in your listing; box items if necessary.</string>
     <string name="TooltipOutboxTooManyObjects">Item count exceeds [AMOUNT]. In order to sell more than [AMOUNT] items in one listing, you must box some of them.</string>
-    <string name="TooltipOutboxTooManyStockItems">Stock folder count exceeds [AMOUNT].</string>
+    <string name="TooltipOutboxTooManyStockItems">Stock items count exceeds [AMOUNT].</string>
     <string name="TooltipOutboxCannotDropOnRoot">You can only drop items or folders in the ALL tab. Please select that tab and move your item(s) or folder(s) again.</string>
 	<string name="TooltipOutboxNoTransfer">One or more of these objects cannot be sold or transferred</string>
 	<string name="TooltipOutboxNotInInventory">You can only put items from your inventory on the marketplace</string>
-- 
cgit v1.2.3


From b4d22741a6118719d45f278ed64f2c4635f0058e Mon Sep 17 00:00:00 2001
From: Merov Linden <merov@lindenlab.com>
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"/>
     </notification>
     
+    <notification
+        icon="OutboxStatus_Error"
+        name="MerchantFolderActivationFailed"
+        type="outbox">
+        Activating this version folder failed with error :
+
+        &apos;[ERROR_CODE]&apos;
+
+        <usetemplate
+        name="okbutton"
+        yestext="OK"/>
+    </notification>
+
     <notification
         icon="alertmodal.tga"
         name="ConfirmMerchantActiveChange"
-- 
cgit v1.2.3


From b8a799cb870b1df88a9ae8a407f8c2d9e00c558b Mon Sep 17 00:00:00 2001
From: Merov Linden <merov@lindenlab.com>
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.
         
         <usetemplate
         name="okbutton"
-- 
cgit v1.2.3


From 8e117983808f7b4f9d4aa288ec48cea5f0f89536 Mon Sep 17 00:00:00 2001
From: Merov Linden <merov@lindenlab.com>
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.
     </notification>
     
     <notification
+        icon="alertmodal.tga"
+        name="AlertMerchantStockFolderEmpty"
+        type="alertmodal">
+        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.
+        <tag>confirm</tag>
+        <usetemplate
+        ignoretext="Alert when a listing is unlisted because stock folder is empty"
+        name="okignore"
+        yestext="OK"/>
+    </notification>
+
+  <notification
    icon="alertmodal.tga"
    name="CompileQueueSaveText"
    type="alertmodal">
-- 
cgit v1.2.3


From 36ce6fbda5ffe8474129c28ab77090c25967b51b Mon Sep 17 00:00:00 2001
From: Merov Linden <merov@lindenlab.com>
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">
     <menu_item_check
-       label="Sort by stock amount (low to high)"
-       name="sort_by_stock_amount">
-      <menu_item_check.on_click
-         function="Marketplace.ViewSort.Action"
-       parameter="sort_by_stock_amount"/>
-      <menu_item_check.on_check
-         function="Marketplace.ViewSort.CheckItem"
-         parameter="sort_by_stock_amount"/>
+        label="Sort by name"
+        name="sort_by_name">
+        <menu_item_check.on_click
+        function="Marketplace.ViewSort.Action"
+        parameter="sort_by_name" />
+        <menu_item_check.on_check
+        function="Marketplace.ViewSort.CheckItem"
+        parameter="sort_by_name" />
+    </menu_item_check>
+    <menu_item_check
+        label="Sort by most recent"
+        name="sort_by_recent">
+        <menu_item_check.on_click
+        function="Marketplace.ViewSort.Action"
+        parameter="sort_by_recent" />
+        <menu_item_check.on_check
+        function="Marketplace.ViewSort.CheckItem"
+        parameter="sort_by_recent" />
+    </menu_item_check>
+    <menu_item_check
+        label="Sort by stock amount (low to high)"
+        name="sort_by_stock_amount">
+        <menu_item_check.on_click
+        function="Marketplace.ViewSort.Action"
+        parameter="sort_by_stock_amount"/>
+        <menu_item_check.on_check
+        function="Marketplace.ViewSort.CheckItem"
+        parameter="sort_by_stock_amount"/>
     </menu_item_check>
+    <menu_item_separator
+    layout="topleft" />
     <menu_item_check
         label="Show only listing folders"
         name="show_only_listing_folders">
-- 
cgit v1.2.3


From dad6f5d29f09955ad3fef243d52de9636a03fb53 Mon Sep 17 00:00:00 2001
From: Merov Linden <merov@lindenlab.com>
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.</string>
     <string name="TooltipOutboxTooManyFolders">Subfolder count exceeds [AMOUNT]. Decrease the number of folders in your listing; box items if necessary.</string>
     <string name="TooltipOutboxTooManyObjects">Item count exceeds [AMOUNT]. In order to sell more than [AMOUNT] items in one listing, you must box some of them.</string>
     <string name="TooltipOutboxTooManyStockItems">Stock items count exceeds [AMOUNT].</string>
-    <string name="TooltipOutboxCannotDropOnRoot">You can only drop items or folders in the ALL tab. Please select that tab and move your item(s) or folder(s) again.</string>
+    <string name="TooltipOutboxCannotDropOnRoot">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.</string>
 	<string name="TooltipOutboxNoTransfer">One or more of these objects cannot be sold or transferred</string>
 	<string name="TooltipOutboxNotInInventory">You can only put items from your inventory on the marketplace</string>
 	<string name="TooltipOutboxLinked">You can't put linked items or folders on the marketplace</string>
-- 
cgit v1.2.3


From 84a7394ae03608556b5974ca1bdfc280cf5874b7 Mon Sep 17 00:00:00 2001
From: Merov Linden <merov@lindenlab.com>
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"/>
     </notification>
 
+    <notification
+        icon="alertmodal.tga"
+        name="MerchantForceValidateListing"
+        type="alertmodal">
+        In order to create your listing, we fixed the hierarchy of your listing contents.
+        <tag>confirm</tag>
+        <usetemplate
+            ignoretext="Confirm when creating a listing validates the content"
+            name="okignore" 
+            yestext="OK"/>
+    </notification>
+
     <notification
         icon="alertmodal.tga"
         name="ConfirmMerchantActiveChange"
-- 
cgit v1.2.3


From 97fc50e1618b5441d6c7f305506801b85b4caacd Mon Sep 17 00:00:00 2001
From: Merov Linden <merov@lindenlab.com>
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.
         <tag>confirm</tag>
         <usetemplate
-            ignoretext="Confirm when creating a listing validates the content"
+            ignoretext="Warn me that creating a listing fixes the hierarchy of the content"
             name="okignore" 
             yestext="OK"/>
     </notification>
-- 
cgit v1.2.3


From ab73b1af8fad5f012f782632a08740b4a0a1c8fa Mon Sep 17 00:00:00 2001
From: Merov Linden <merov@lindenlab.com>
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"/>
     </notification>
 
+    <notification
+        icon="alertmodal.tga"
+        name="AlertMerchantVersionFolderEmpty"
+        type="alertmodal">
+        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.
+        <tag>confirm</tag>
+        <usetemplate
+        ignoretext="Alert when a listing is unlisted because version folder is empty"
+        name="okignore"
+        yestext="OK"/>
+    </notification>
+
   <notification
    icon="alertmodal.tga"
    name="CompileQueueSaveText"
-- 
cgit v1.2.3


From acc07fa6bdb16be95ee4cb837bf43497d719f51b Mon Sep 17 00:00:00 2001
From: Oz Linden <oz@lindenlab.com>
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.</string>
 	
 	<string name="NotConnected">Not Connected</string>
 	<string name="AgentNameSubst">(You)</string> <!-- Substitution for agent name -->
-	<string name="JoinAnExperience"></string> <!-- intentionally left blank -->
+	<string name="JoinAnExperience">Join An Experience</string>
 	<string name="SilentlyManageEstateAccess">Suppress alerts when managing estate access lists</string>
 	<string name="OverrideYourAnimations">Replace your default animations</string>
 	<string name="ScriptReturnObjects">Return objects on your behalf</string>
@@ -526,6 +526,8 @@ Please try logging in again in a minute.</string>
 	<string name="load_file_verb">Load</string>
 	<string name="targa_image_files">Targa Images</string>
 	<string name="bitmap_image_files">Bitmap Images</string>
+	<string name="png_image_files">PNG Images</string>
+	<string name="save_texture_image_files">Targa or PNG Images</string>
 	<string name="avi_movie_file">AVI Movie File</string>
 	<string name="xaf_animation_file">XAF Anim File</string>
 	<string name="xml_file">XML File</string>
@@ -2533,8 +2535,8 @@ This feature is currently in Beta. Please add your name to this [http://goo.gl/f
 	<string name="CompileQueueProblemDownloading">Problem downloading</string>
 	<string name="CompileQueueInsufficientPermDownload">Insufficient permissions to download a script.</string>
 	<string name="CompileQueueInsufficientPermFor">Insufficient permissions for</string>
-   <string name="CompileQueueUnknownFailure">Unknown failure to download</string>
-   <string name="CompileNoExperiencePerm">Skipping script [SCRIPT] with Experience [EXPERIENCE].</string>
+	<string name="CompileQueueUnknownFailure">Unknown failure to download</string>
+	<string name="CompileNoExperiencePerm">Skipping script [SCRIPT] with Experience [EXPERIENCE].</string>
 	<string name="CompileQueueTitle">Recompilation Progress</string>
 	<string name="CompileQueueStart">recompile</string>
 	<string name="ResetQueueTitle">Reset Progress</string>
-- 
cgit v1.2.3


From 4ac031a899383cd61f318e86d09816078b75c2fe Mon Sep 17 00:00:00 2001
From: Oz Linden <oz@lindenlab.com>
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.</string>
 	
 	<string name="NotConnected">Not Connected</string>
 	<string name="AgentNameSubst">(You)</string> <!-- Substitution for agent name -->
-	<string name="JoinAnExperience">Join An Experience</string>
+	<string name="JoinAnExperience"/><!-- intentionally blank -->
 	<string name="SilentlyManageEstateAccess">Suppress alerts when managing estate access lists</string>
 	<string name="OverrideYourAnimations">Replace your default animations</string>
 	<string name="ScriptReturnObjects">Return objects on your behalf</string>
-- 
cgit v1.2.3