DD-70 : Use List/Delist for listing folders and Activate/Deactivate for version folders. Also create test SLM ID when creating listing.

3 files changed, 34 insertions, 18 deletions

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>