* Removed old inventory window outbox.

* Added centered progress indicator for outbox.

2 files changed, 37 insertions, 158 deletions

diff --git a/indra/newview/skins/default/xui/en/floater_merchant_outbox.xml b/indra/newview/skins/default/xui/en/floater_merchant_outbox.xml
index 86e27cbc71..f0b29f2248 100644
--- a/indra/newview/skins/default/xui/en/floater_merchant_outbox.xml
+++ b/indra/newview/skins/default/xui/en/floater_merchant_outbox.xml
@@ -6,7 +6,7 @@
  height="440"
  help_topic="floater_merchant_outbox"
  min_width="300"
- min_height="240"
+ min_height="100"
  name="floater_merchant_outbox"
  save_rect="true"
  save_visibility="true"
@@ -49,7 +49,7 @@
 			<text
 				name="outbox_inventory_placeholder_title"
 				type="string"
-				follows="all"
+				follows="top|left|right"
 				layout="topleft"
 				top="10"
 				left="0"
@@ -63,7 +63,7 @@
 			<text
 				name="outbox_inventory_placeholder_text"
 				type="string"
-				follows="all"
+				follows="top|left|right"
 				layout="topleft"
 				top="35"
 				left="0"
@@ -74,27 +74,6 @@
 		</panel>
     </panel>
 	<panel
-		name="outbox_inventory_disable_panel"
-        follows="all"
-        left="0"
-        bottom="440"
-        width="333"
-        top="0"
-        bg_opaque_color="White_50"
-        background_visible="true"
-        background_opaque="true"
-		visible="false"
-        />
-	<loading_indicator
-		 follows="all"
-		 height="65"
-		 layout="topleft"
-		 left="140"
-		 name="import_progress_indicator"
-		 top="180"
-		 visible="false"
-		 width="45" />
-	<panel
         follows="bottom|left|right"
         left="10"
         bottom="435"
@@ -116,7 +95,7 @@
 			wrap="true"
 			halign="left"
 			valign="baseline"
-			font="SansSerifBold" />
+			font="SansSerif" />
 		<button
 			 label="Send to Marketplace"
 			 tool_tip="Push to my Marketplace Storefront"
@@ -131,5 +110,36 @@
 			 width="200"
 			 enabled="false" />
     </panel>
+	<panel
+		name="outbox_inventory_disable_panel"
+        follows="all"
+        left="0"
+        bottom="440"
+        width="333"
+        top="0"
+        bg_opaque_color="White_50"
+        background_visible="true"
+        background_opaque="true"
+		visible="false"
+        />
+	<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="45" auto_resize="false">
+			<layout_stack orientation="horizontal" left="0" height="45" top="0" width="333" follows="all">
+				<layout_panel width="0" />
+				<layout_panel width="45" auto_resize="false">
+					<loading_indicator
+						 height="45"
+						 layout="topleft"
+						 left="0"
+						 top="0"
+						 width="45"
+						 />
+				</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/sidepanel_inventory.xml b/indra/newview/skins/default/xui/en/sidepanel_inventory.xml
index 9f3c57fa0f..0b14fd0459 100644
--- a/indra/newview/skins/default/xui/en/sidepanel_inventory.xml
+++ b/indra/newview/skins/default/xui/en/sidepanel_inventory.xml
@@ -153,139 +153,8 @@
                     </panel>
                  </panel>
              </layout_panel>
-             <layout_panel
-                 width="330"
-                 layout="topleft"
-                 auto_resize="true"
-                 user_resize="false"
-                 follows="all"
-                 name="outbox_layout_panel"
-                 visible="false"
-                 min_dim="35"
-                 max_dim="200"
-                 expanded_min_dim="90"
-                 height="200">
-                 <panel
-                      follows="all"
-                      layout="topleft"
-                      left="0"
-                      name="marketplace_outbox"
-                      class="panel_marketplace_outbox"
-                      top="0"
-                      label=""
-                      height="200"
-                      width="330">
-                     <string name="OutboxLabelWithArg">Merchant outbox ([NUM])</string>
-                     <string name="OutboxLabelNoArg">Merchant outbox</string>
-                     <button
-                        label="Merchant outbox"
-                        font="SansSerifMedium"
-                        name="outbox_btn"
-                        height="35"
-                        width="308"
-                        image_unselected="MarketplaceBtn_Off"
-                        image_selected="MarketplaceBtn_Selected"
-                        halign="left"
-                        handle_right_mouse="false"
-                        follows="top|left|right"
-                        is_toggle="true"
-                        tab_stop="false"
-                        pad_left="35"
-                        top="0"
-                        left="10" />
-                     <button
-                         image_unselected="OutboxPush_Off"
-                         image_selected="OutboxPush_Selected"
-                         image_hover_selected="OutboxPush_Selected_Over"
-                         image_hover_unselected="OutboxPush_Over"
-                         image_disabled_selected="OutboxPush_Selected_Disabled"
-                         image_disabled="OutboxPush_Disabled"
-                         image_pressed="OutboxPush_Press"
-                         image_pressed_selected="OutboxPush_Selected_Press"
-                         label=""
-                         tool_tip="Push to my Marketplace Storefront"
-                         is_toggle="false"
-                         name="outbox_import_btn"
-                         follows="top|right"
-                         tab_stop="false"
-                         halign="center"
-                         top="6"
-                         left="-50"
-                         height="23"
-                         width="32"
-                         enabled="false" />
-                     <loading_indicator
-                        follows="top|right"
-                        name="outbox_import_indicator"
-                        top="6"
-                        left="-50"
-                        height="23"
-                        width="32"
-                        images_per_sec="1.15"
-                        tab_stop="false"
-                        visible="false">
-                         <images>
-                             <image name="OutboxPush_Progress_1"/>
-                             <image name="OutboxPush_Progress_2"/>
-                             <image name="OutboxPush_Progress_3"/>
-                             <image name="OutboxPush_Progress_4"/>
-                             <image name="OutboxPush_Progress_5"/>
-                             <image name="OutboxPush_Progress_6"/>
-                         </images>
-                     </loading_indicator>
-                     <panel
-                        follows="all"
-                        left="10"
-                        bottom="200"
-                        width="308"
-                        top="35"
-                        bg_opaque_color="InventoryBackgroundColor"
-                        background_visible="true"
-                        background_opaque="true"
-                        >
-						<panel
-							name="outbox_inventory_placeholder_panel"
-							follows="all"
-							layout="topleft"
-							top="0"
-							left="0"
-							width="308"
-							height="165"
-							bg_opaque_color="InventoryBackgroundColor"
-							background_visible="true"
-							background_opaque="true"
-							>
-							<text
-								name="outbox_inventory_placeholder_title"
-								type="string"
-								follows="all"
-								layout="topleft"
-								top="10"
-								left="0"
-								width="308"
-								height="25"
-								wrap="true"
-								halign="center"
-								font="SansSerifBold">
-								Loading...
-							</text>
-							<text
-								name="outbox_inventory_placeholder_text"
-								type="string"
-								follows="all"
-								layout="topleft"
-								top="35"
-								left="0"
-								width="308"
-								height="130"
-								wrap="true"
-								halign="left" />
-						</panel>
-                    </panel>
-                 </panel>
-             </layout_panel>
-						 </layout_stack>
-						 </layout_panel>
+			 </layout_stack>
+			 </layout_panel>
          </layout_stack>
 		<panel
 		     follows="bottom|left|right"