merge changes for 3.8.2-release

17 files changed, 902 insertions, 30 deletions

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>
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>
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..0806a87288
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/floater_marketplace_listings.xml
@@ -0,0 +1,113 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<floater
+  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">
+  <panel
+    name="marketplace_listings_panel"
+    follows="all"
+    layout="topleft"
+    left="0"
+    top="0"
+    height="440"
+    width="333">
+    <panel
+      follows="all"
+      left="10"
+      height="440"
+      width="313"
+      top="0"
+      bg_opaque_color="InventoryBackgroundColor">
+      <panel
+        name="marketplace_listings_inventory_placeholder_panel"
+        follows="all"
+        layout="topleft"
+        top="0"
+        left="0"
+        width="313"
+        height="440"
+        bg_opaque_color="InventoryBackgroundColor">
+        <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
+        name="panel_marketplace_listing"
+        filename="panel_marketplace_listings.xml"
+        class="llpanelmarketplacelistings"
+        top="0"
+        follows="all"/>
+      </panel>
+    <panel
+      name="marketplace_panel_status"
+      follows="bottom|left|right"
+      layout="topleft"
+      left="10"
+      width="313"
+      height="20">
+      <text
+        name="marketplace_status"
+        type="string"
+        follows="bottom|left|right"
+        layout="topleft"
+        top="0"
+        left="5"
+        width="150"
+        height="20"
+        wrap="true"
+        halign="left"
+        valign="center"
+        font="SansSerif"/>
+    </panel>
+    <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">
+          <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_marketplace_validation.xml b/indra/newview/skins/default/xui/en/floater_marketplace_validation.xml
new file mode 100755
index 0000000000..9035a7c161
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/floater_marketplace_validation.xml
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater
+    title="Audit Marketplace Listings"
+    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
+    name="OK"
+    label="OK"
+    label_selected="OK"
+    layout="topleft"
+    follows="right|bottom"
+    top="465"
+    width="100"
+    height="20"
+    left="484"/>
+    <text_editor
+     name="validation_text"
+     type="string"
+     font="SansSerif"
+     length="1"
+     max_length="65536"
+     layout="topleft"
+     follows="all"
+     bg_readonly_color="TextBgReadOnlyColor"
+     text_readonly_color="TextFgReadOnlyColor"
+     top="25"
+     bottom="455"
+     left="20"
+     right="-20"
+     word_wrap="true">
+        MARKETPLACE_VALIDATION_TEXT
+    </text_editor>
+</floater>
diff --git a/indra/newview/skins/default/xui/en/menu_inventory.xml b/indra/newview/skins/default/xui/en/menu_inventory.xml
index 7099db63ab..91adec0789 100755
--- a/indra/newview/skins/default/xui/en/menu_inventory.xml
+++ b/indra/newview/skins/default/xui/en/menu_inventory.xml
@@ -4,6 +4,81 @@
  layout="topleft"
  name="Popup"
  visible="false">
+	<menu_item_call
+        label="Create listing"
+        layout="topleft"
+        name="Marketplace Create Listing">
+		<menu_item_call.on_click
+        function="Inventory.DoToSelected"
+        parameter="marketplace_create_listing" />
+	</menu_item_call>
+	<menu_item_call
+        label="Associate listing"
+        layout="topleft"
+        name="Marketplace Associate Listing">
+		<menu_item_call.on_click
+        function="Inventory.DoToSelected"
+        parameter="marketplace_associate_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="Check for errors"
+        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">
+		<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_unlist" />
+	</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"
@@ -718,12 +793,20 @@
 		 parameter="copy_to_outbox" />
 	</menu_item_call>
 	<menu_item_call
-	 label="Send to Marketplace"
-	 layout="topleft"
-	 name="Marketplace Send">
+        label="Copy to Marketplace Listings"
+        layout="topleft"
+        name="Marketplace Copy">
 		<menu_item_call.on_click
-		 function="Inventory.DoToSelected"
-		 parameter="send_to_marketplace" />
+        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--"
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..4b3bb8ee1c
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/menu_marketplace_view.xml
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<toggleable_menu
+ name="menu_marketplace_sort"
+ left="0" bottom="0" visible="false"
+ mouse_opaque="false">
+    <menu_item_check
+        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">
+        <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>
diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml
index a1b54d9ca7..9111ca389f 100755
--- a/indra/newview/skins/default/xui/en/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en/menu_viewer.xml
@@ -180,6 +180,13 @@
          function="Floater.ToggleOrBringToFront"
          parameter="outbox" />
       </menu_item_call>
+        <menu_item_call
+            label="Marketplace listings..."
+            name="MarketplaceListings">
+            <menu_item_call.on_click
+            function="Floater.ToggleOrBringToFront"
+            parameter="marketplace_listings" />
+        </menu_item_call>
       <menu_item_call
            label="Account dashboard..."
            name="Manage My Account">
diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index 506b110afe..0c2b72ac56 100755
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -308,9 +308,251 @@ Initialization with the Marketplace failed because of a system or network error.
          name="okbutton"
          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"
+        type="outbox">
+        Copy or move to Marketplace Listings failed with error :
+        
+        &apos;[ERROR_CODE]&apos;
+        
+        <usetemplate
+        name="okbutton"
+        yestext="OK"/>
+    </notification>
+    
+    <notification
+        icon="OutboxStatus_Error"
+        name="MerchantTransactionFailed"
+        type="outbox">
+        The transaction with the Marketplace failed with the following error :
+        
+        Reason : &apos;[ERROR_REASON]&apos;
+        [ERROR_DESCRIPTION]
+        
+        <usetemplate
+        name="okbutton"
+        yestext="OK"/>
+    </notification>
     
+    <notification
+        icon="OutboxStatus_Error"
+        name="MerchantUnprocessableEntity"
+        type="outbox">
+        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"
+        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="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="MerchantForceValidateListing"
+        type="alertmodal">
+        In order to create your listing, we fixed the hierarchy of your listing contents.
+        <tag>confirm</tag>
+        <usetemplate
+            ignoretext="Warn me that creating a listing fixes the hierarchy of the content"
+            name="okignore" 
+            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"
+        name="ConfirmMerchantMoveInventory"
+        type="alertmodal">
+        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"
+        name="okcancelignore"
+        notext="Cancel"
+        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="ConfirmCopyToMarketplace"
+        type="alertmodal">
+        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="yesnocancelbuttons"
+        yestext="Move item(s)"
+        notext="Don't move item(s)"
+        canceltext="Cancel"/>
+    </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="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="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="AlertMerchantListingCannotWear"
+        type="alertmodal">
+        You cannot wear clothes or body parts that are in the Marketplace Listings folder.
+        <tag>fail</tag>
+    </notification>
+    
+    <notification
+        icon="alertmodal.tga"
+        name="AlertMerchantListingInvalidID"
+        type="alertmodal">
+        Invalid listing ID.
+        <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="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="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="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"
    type="alertmodal">
@@ -4566,6 +4808,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">
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..2b17473a84
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/panel_marketplace_listings.xml
@@ -0,0 +1,117 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel
+  label="Marketplace"
+  name="Marketplace Panel"
+  follows="all"
+  layout="topleft"
+  width="308"
+  height="440">
+  <panel
+    name="tool_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"/>
+    <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"
+      label="Check for Errors"
+      tool_tip="Check your marketplace listings"
+      layout="topleft"
+      follows="top|right"
+      width="97"
+      height="26"
+      left_pad="143"/>
+  </panel>
+  <panel
+    name="tab_container_panel"
+    follows="all"
+    layout="topleft"
+    default_tab_group="1"
+    width="308"
+    height="350">
+  <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="30"
+    left="0"
+    top_pad="0"
+    width="308"
+    height="320"
+    halign="center"
+    tab_height="30"
+    tab_group="1"
+    tab_position="top"
+    tab_min_width="50">
+  </tab_container>
+  </panel>
+  <panel
+      name="marketplace_drop_zone"
+      mouse_opaque="true"
+      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
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..8d5fa265e2
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/panel_marketplace_listings_inventory.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<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="true"
+    show_root_folder="false"
+    use_marketplace_folders="true"
+    start_folder.type="merchant"
+    tool_tip="Drag and drop items here to list 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>
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..44f507ad84
--- /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="true"
+    show_root_folder="false"
+    use_marketplace_folders="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..871e8773c4
--- /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="true"
+    show_root_folder="false"
+    use_marketplace_folders="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..98bef04aa7
--- /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="true"
+    show_root_folder="false"
+    use_marketplace_folders="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_outbox_inventory.xml b/indra/newview/skins/default/xui/en/panel_outbox_inventory.xml
index c80e5b168a..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"
@@ -28,5 +27,5 @@
               text_pad_right="4"
               arrow_size="12"
               max_folder_item_overlap="2"/>
-      <item allow_open="false"/>
+      <item allow_wear="false"/>
 </inventory_panel>
diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index 892e882049..83c856a63e 100755
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -236,14 +236,20 @@ 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 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="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="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="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="TooltipOutboxTooManyStockItems">Stock items count exceeds [AMOUNT].</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>
+	<string name="TooltipOutboxCallingCard">You can't put calling cards on the marketplace</string>
+	<string name="TooltipOutboxDragActive">You can't move a listed listing</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>
@@ -489,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"/><!-- 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>
@@ -520,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>
@@ -2254,6 +2262,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 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>
@@ -2281,16 +2290,45 @@ 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="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>
+	<string name="InventoryMarketplaceListingsNoItemsTooltip"></string>
+	<string name="InventoryMarketplaceListingsNoItems">
+        Drag folders to this area to list them for sale on the [[MARKETPLACE_DASHBOARD_URL] Marketplace].
+	</string>
+
+	<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>
+	<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 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">: 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 errors or warnings to report</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 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 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 cannot be sold on the Marketplace.</string>
+
+	<string name="MarketplaceNoID">no Mkt ID</string>
+	<string name="MarketplaceLive">listed</string>
+	<string name="MarketplaceActive">active</string>
+	<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>
@@ -2497,8 +2535,8 @@ The [[MARKETPLACE_CREATE_STORE_URL] Marketplace store] is returning errors.
 	<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>
@@ -3954,6 +3992,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">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>
@@ -3984,6 +4023,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>
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