From 98bcd9e2efe4cc0dc5e51da09c6f18424b9d9144 Mon Sep 17 00:00:00 2001
From: Leslie Linden <none@none>
Date: Mon, 6 Jun 2011 17:00:59 -0700
Subject: EXP-859 FIX -- Save setting for last time inbox expanded EXP-841
 PROGRESS -- Create outbox sync button with basic enable/disable logic and
 animation EXP-866 PROGRESS -- Create inbox observer to dynamically update
 inbox item count and badge value EXP-872 PROGRESS -- Hide inbox and outbox
 unless applicable

Inbox expansion time is now saved as setting variable "LastInventoryInboxExpand".

New outbox sync button art.

Observers for items and categories are now implemented in the LLSidepanelInventory but the exact
method of use is still to be determined.

Functions are in place to show and hide the inbox and outbox panels but the logic around the
decision is TBD.

The resize bar for the inbox/outbox is now disabled when both inbox and outbox are collapsed.

Reviewed by Leyla.
---
 .../default/textures/icons/OutboxPush_Disabled.png | Bin 0 -> 1848 bytes
 .../default/textures/icons/OutboxPush_Off.png      | Bin 0 -> 1835 bytes
 .../skins/default/textures/icons/OutboxPush_On.png | Bin 0 -> 1851 bytes
 .../default/textures/icons/OutboxPush_On_Over.png  | Bin 0 -> 1863 bytes
 .../textures/icons/OutboxPush_On_Selected.png      | Bin 0 -> 1912 bytes
 .../default/textures/icons/OutboxPush_Over.png     | Bin 0 -> 1826 bytes
 .../default/textures/icons/OutboxPush_Press.png    | Bin 0 -> 1891 bytes
 .../textures/icons/OutboxPush_Progress_1.png       | Bin 0 -> 1848 bytes
 .../textures/icons/OutboxPush_Progress_2.png       | Bin 0 -> 1807 bytes
 .../textures/icons/OutboxPush_Progress_3.png       | Bin 0 -> 1819 bytes
 .../textures/icons/OutboxPush_Progress_4.png       | Bin 0 -> 1894 bytes
 .../textures/icons/OutboxPush_Progress_5.png       | Bin 0 -> 1921 bytes
 .../textures/icons/OutboxPush_Progress_6.png       | Bin 0 -> 1853 bytes
 .../default/textures/icons/OutboxPush_Selected.png | Bin 0 -> 1894 bytes
 .../icons/OutboxPush_Selected_Disabled.png         | Bin 0 -> 1840 bytes
 .../textures/icons/OutboxPush_Selected_Over.png    | Bin 0 -> 1870 bytes
 .../textures/icons/OutboxPush_Selected_Press.png   | Bin 0 -> 1912 bytes
 indra/newview/skins/default/textures/textures.xml  |  19 +++-
 .../skins/default/xui/en/sidepanel_inventory.xml   | 117 +++++++++++----------
 19 files changed, 79 insertions(+), 57 deletions(-)
 create mode 100644 indra/newview/skins/default/textures/icons/OutboxPush_Disabled.png
 create mode 100644 indra/newview/skins/default/textures/icons/OutboxPush_Off.png
 create mode 100644 indra/newview/skins/default/textures/icons/OutboxPush_On.png
 create mode 100644 indra/newview/skins/default/textures/icons/OutboxPush_On_Over.png
 create mode 100644 indra/newview/skins/default/textures/icons/OutboxPush_On_Selected.png
 create mode 100644 indra/newview/skins/default/textures/icons/OutboxPush_Over.png
 create mode 100644 indra/newview/skins/default/textures/icons/OutboxPush_Press.png
 create mode 100644 indra/newview/skins/default/textures/icons/OutboxPush_Progress_1.png
 create mode 100644 indra/newview/skins/default/textures/icons/OutboxPush_Progress_2.png
 create mode 100644 indra/newview/skins/default/textures/icons/OutboxPush_Progress_3.png
 create mode 100644 indra/newview/skins/default/textures/icons/OutboxPush_Progress_4.png
 create mode 100644 indra/newview/skins/default/textures/icons/OutboxPush_Progress_5.png
 create mode 100644 indra/newview/skins/default/textures/icons/OutboxPush_Progress_6.png
 create mode 100644 indra/newview/skins/default/textures/icons/OutboxPush_Selected.png
 create mode 100644 indra/newview/skins/default/textures/icons/OutboxPush_Selected_Disabled.png
 create mode 100644 indra/newview/skins/default/textures/icons/OutboxPush_Selected_Over.png
 create mode 100644 indra/newview/skins/default/textures/icons/OutboxPush_Selected_Press.png

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/textures/icons/OutboxPush_Disabled.png b/indra/newview/skins/default/textures/icons/OutboxPush_Disabled.png
new file mode 100644
index 0000000000..be58114aa1
Binary files /dev/null and b/indra/newview/skins/default/textures/icons/OutboxPush_Disabled.png differ
diff --git a/indra/newview/skins/default/textures/icons/OutboxPush_Off.png b/indra/newview/skins/default/textures/icons/OutboxPush_Off.png
new file mode 100644
index 0000000000..e6b9480ab1
Binary files /dev/null and b/indra/newview/skins/default/textures/icons/OutboxPush_Off.png differ
diff --git a/indra/newview/skins/default/textures/icons/OutboxPush_On.png b/indra/newview/skins/default/textures/icons/OutboxPush_On.png
new file mode 100644
index 0000000000..ffda2e92d4
Binary files /dev/null and b/indra/newview/skins/default/textures/icons/OutboxPush_On.png differ
diff --git a/indra/newview/skins/default/textures/icons/OutboxPush_On_Over.png b/indra/newview/skins/default/textures/icons/OutboxPush_On_Over.png
new file mode 100644
index 0000000000..6b5911014f
Binary files /dev/null and b/indra/newview/skins/default/textures/icons/OutboxPush_On_Over.png differ
diff --git a/indra/newview/skins/default/textures/icons/OutboxPush_On_Selected.png b/indra/newview/skins/default/textures/icons/OutboxPush_On_Selected.png
new file mode 100644
index 0000000000..0e60b417b0
Binary files /dev/null and b/indra/newview/skins/default/textures/icons/OutboxPush_On_Selected.png differ
diff --git a/indra/newview/skins/default/textures/icons/OutboxPush_Over.png b/indra/newview/skins/default/textures/icons/OutboxPush_Over.png
new file mode 100644
index 0000000000..9c26b92e73
Binary files /dev/null and b/indra/newview/skins/default/textures/icons/OutboxPush_Over.png differ
diff --git a/indra/newview/skins/default/textures/icons/OutboxPush_Press.png b/indra/newview/skins/default/textures/icons/OutboxPush_Press.png
new file mode 100644
index 0000000000..3b5d462975
Binary files /dev/null and b/indra/newview/skins/default/textures/icons/OutboxPush_Press.png differ
diff --git a/indra/newview/skins/default/textures/icons/OutboxPush_Progress_1.png b/indra/newview/skins/default/textures/icons/OutboxPush_Progress_1.png
new file mode 100644
index 0000000000..f85be047b0
Binary files /dev/null and b/indra/newview/skins/default/textures/icons/OutboxPush_Progress_1.png differ
diff --git a/indra/newview/skins/default/textures/icons/OutboxPush_Progress_2.png b/indra/newview/skins/default/textures/icons/OutboxPush_Progress_2.png
new file mode 100644
index 0000000000..cd4e482216
Binary files /dev/null and b/indra/newview/skins/default/textures/icons/OutboxPush_Progress_2.png differ
diff --git a/indra/newview/skins/default/textures/icons/OutboxPush_Progress_3.png b/indra/newview/skins/default/textures/icons/OutboxPush_Progress_3.png
new file mode 100644
index 0000000000..d212a871ce
Binary files /dev/null and b/indra/newview/skins/default/textures/icons/OutboxPush_Progress_3.png differ
diff --git a/indra/newview/skins/default/textures/icons/OutboxPush_Progress_4.png b/indra/newview/skins/default/textures/icons/OutboxPush_Progress_4.png
new file mode 100644
index 0000000000..e5b6023e36
Binary files /dev/null and b/indra/newview/skins/default/textures/icons/OutboxPush_Progress_4.png differ
diff --git a/indra/newview/skins/default/textures/icons/OutboxPush_Progress_5.png b/indra/newview/skins/default/textures/icons/OutboxPush_Progress_5.png
new file mode 100644
index 0000000000..e1911a092f
Binary files /dev/null and b/indra/newview/skins/default/textures/icons/OutboxPush_Progress_5.png differ
diff --git a/indra/newview/skins/default/textures/icons/OutboxPush_Progress_6.png b/indra/newview/skins/default/textures/icons/OutboxPush_Progress_6.png
new file mode 100644
index 0000000000..9e59f7843a
Binary files /dev/null and b/indra/newview/skins/default/textures/icons/OutboxPush_Progress_6.png differ
diff --git a/indra/newview/skins/default/textures/icons/OutboxPush_Selected.png b/indra/newview/skins/default/textures/icons/OutboxPush_Selected.png
new file mode 100644
index 0000000000..51e8bff646
Binary files /dev/null and b/indra/newview/skins/default/textures/icons/OutboxPush_Selected.png differ
diff --git a/indra/newview/skins/default/textures/icons/OutboxPush_Selected_Disabled.png b/indra/newview/skins/default/textures/icons/OutboxPush_Selected_Disabled.png
new file mode 100644
index 0000000000..300e2e69e1
Binary files /dev/null and b/indra/newview/skins/default/textures/icons/OutboxPush_Selected_Disabled.png differ
diff --git a/indra/newview/skins/default/textures/icons/OutboxPush_Selected_Over.png b/indra/newview/skins/default/textures/icons/OutboxPush_Selected_Over.png
new file mode 100644
index 0000000000..32fb236381
Binary files /dev/null and b/indra/newview/skins/default/textures/icons/OutboxPush_Selected_Over.png differ
diff --git a/indra/newview/skins/default/textures/icons/OutboxPush_Selected_Press.png b/indra/newview/skins/default/textures/icons/OutboxPush_Selected_Press.png
new file mode 100644
index 0000000000..827f343b1e
Binary files /dev/null and b/indra/newview/skins/default/textures/icons/OutboxPush_Selected_Press.png differ
diff --git a/indra/newview/skins/default/textures/textures.xml b/indra/newview/skins/default/textures/textures.xml
index a6e71cc38e..7888674b04 100644
--- a/indra/newview/skins/default/textures/textures.xml
+++ b/indra/newview/skins/default/textures/textures.xml
@@ -332,6 +332,23 @@ with the same filename but different name
   <texture name="OptionsMenu_Off" file_name="icons/OptionsMenu_Off.png" preload="false" />
   <texture name="OptionsMenu_Press" file_name="icons/OptionsMenu_Press.png" preload="false" />
 
+  <texture name="OutboxPush_Disabled" file_name="icons/OutboxPush_Disabled.png" preload="true" />
+  <texture name="OutboxPush_Off" file_name="icons/OutboxPush_Off.png" preload="true" />
+  <texture name="OutboxPush_On" file_name="icons/OutboxPush_On.png" preload="true" />
+  <texture name="OutboxPush_On_Over" file_name="icons/OutboxPush_On_Over.png" preload="true" />
+  <texture name="OutboxPush_Over" file_name="icons/OutboxPush_Over.png" preload="true" />
+  <texture name="OutboxPush_Press" file_name="icons/OutboxPush_Press.png" preload="true" />
+  <texture name="OutboxPush_Progress_1" file_name="icons/OutboxPush_Progress_1.png" preload="true" />
+  <texture name="OutboxPush_Progress_2" file_name="icons/OutboxPush_Progress_2.png" preload="true" />
+  <texture name="OutboxPush_Progress_3" file_name="icons/OutboxPush_Progress_3.png" preload="true" />
+  <texture name="OutboxPush_Progress_4" file_name="icons/OutboxPush_Progress_4.png" preload="true" />
+  <texture name="OutboxPush_Progress_5" file_name="icons/OutboxPush_Progress_5.png" preload="true" />
+  <texture name="OutboxPush_Progress_6" file_name="icons/OutboxPush_Progress_6.png" preload="true" />
+  <texture name="OutboxPush_Selected" file_name="icons/OutboxPush_Selected.png" preload="true" />
+  <texture name="OutboxPush_Selected_Disabled" file_name="icons/OutboxPush_Selected_Disabled.png" preload="true" />
+  <texture name="OutboxPush_Selected_Over" file_name="icons/OutboxPush_Selected_Over.png" preload="true" />
+  <texture name="OutboxPush_Selected_Press" file_name="icons/OutboxPush_Selected_Press.png" preload="true" />
+
   <texture name="PanOrbit_Off" file_name="bottomtray/PanOrbit_Off.png" preload="false" />
 
   <texture name="Parcel_Exp_Color" file_name="icons/Parcel_Exp_Color.png" preload="false" />
@@ -488,7 +505,7 @@ with the same filename but different name
   <texture name="Sync_Progress_5" file_name="icons/Sync_Progress_5.png" preload="true" />
   <texture name="Sync_Progress_6" file_name="icons/Sync_Progress_6.png" preload="true" />
 
-    <texture name="TabIcon_Appearance_Off" file_name="taskpanel/TabIcon_Appearance_Off.png" preload="false" />
+  <texture name="TabIcon_Appearance_Off" file_name="taskpanel/TabIcon_Appearance_Off.png" preload="false" />
   <texture name="TabIcon_Appearance_Selected" file_name="taskpanel/TabIcon_Appearance_Selected.png" preload="false" />
   <texture name="TabIcon_Close_Off" file_name="taskpanel/TabIcon_Close_Off.png" preload="false" />
   <texture name="TabIcon_Home_Off" file_name="taskpanel/TabIcon_Home_Off.png" preload="false" />
diff --git a/indra/newview/skins/default/xui/en/sidepanel_inventory.xml b/indra/newview/skins/default/xui/en/sidepanel_inventory.xml
index 91de3047e6..c945f27ac6 100644
--- a/indra/newview/skins/default/xui/en/sidepanel_inventory.xml
+++ b/indra/newview/skins/default/xui/en/sidepanel_inventory.xml
@@ -89,21 +89,21 @@
                              width="308"
                              top="35"
                              bg_opaque_color="InventoryBackgroundColor"
-  background_visible="true"
-  background_opaque="true"
+                             background_visible="true"
+                             background_opaque="true"
                            >
                              <text
                                  type="string"
-		length="1"
-		follows="top|left|right"
-		font="SansSerifSmall"
+                                 length="1"
+                                 follows="top|left|right"
+                                 font="SansSerifSmall"
                                  use_ellipses="true"
                                  name="move_items_text"
-                               top="10"
-                               left="4"
-                               height="20"
-                               width="304"
-                               >Move items to your inventory to manage and use them.</text>
+                                 top="10"
+                                 left="4"
+                                 height="20"
+                                 width="304"
+                                 >Move items to your inventory to manage and use them.</text>
                              <inventory_panel
                                 bg_opaque_color="DkGray2"
                                 bg_alpha_color="DkGray2"
@@ -125,14 +125,14 @@
                  </panel>
              </layout_panel>
              <layout_panel
-  width="330"
-  auto_resize="true"
+                width="330"
+                auto_resize="true"
                 user_resize="false"
-   follows="bottom|left|right"
-  name="outbox_layout_panel"
-                 min_dim="35"
-                 max_dim="125"
-  height="35">
+                follows="bottom|left|right"
+                name="outbox_layout_panel"
+                min_dim="35"
+                max_dim="125"
+                height="35">
                  <panel
                       follows="all"
                       layout="topleft"
@@ -144,52 +144,57 @@
                       height="125"
                       width="310">
                      <button
-                         label="MARKETPLACE OUTBOX"
-                         is_toggle="true"
-                         name="outbox_btn"
-                      follows="top|left|right"
-                         image_unselected="MarketplaceBtn_Off"
-                            image_selected="MarketplaceBtn_Selected"
-                         height="35"
-                         tab_stop="false"
-                         width="308"
-                         halign="left"
-                         pad_left="35"
-                         top="0"
-                        left="0" />
-                    <button
-                        image_disabled="Sync_Disabled"
-                        image_disabled_selected="Sync_Disabled"
-                        image_unselected="Sync_Enabled"
-                        image_selected="Sync_Enabled"
-                        label=""
-                        is_toggle="false"
-                        name="outbox_sync_btn"
-                        follows="top|right"
-                        height="16"
+                        label="MARKETPLACE OUTBOX"
+                        is_toggle="true"
+                        name="outbox_btn"
+                        follows="top|left|right"
+                        image_unselected="MarketplaceBtn_Off"
+                        image_selected="MarketplaceBtn_Selected"
+                        height="35"
                         tab_stop="false"
-                        width="16"
-                        halign="center"
-                        top="10"
-                        left="-40"
-                        enabled="false" />
+                        width="308"
+                        halign="left"
+                        pad_left="35"
+                        top="0"
+                        left="0" />
+                     <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_sync_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_sync_indicator"
-                        top="10"
-                        left="-40"
-                        height="16"
-                        width="16"
-                        images_per_sec="1.0"
+                        top="6"
+                        left="-50"
+                        height="23"
+                        width="32"
+                        images_per_sec="1.15"
                         tab_stop="false"
                         visible="false">
                          <images>
-                             <image name="Sync_Progress_1"/>
-                             <image name="Sync_Progress_2"/>
-                             <image name="Sync_Progress_3"/>
-                             <image name="Sync_Progress_4"/>
-                             <image name="Sync_Progress_5"/>
-                             <image name="Sync_Progress_6"/>
+                             <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
-- 
cgit v1.2.3