From 6bafd98ae0b12878cb265645190fc46c919773d3 Mon Sep 17 00:00:00 2001
From: Leyla Farazha <leyla@lindenlab.com>
Date: Mon, 16 May 2011 17:17:56 -0700
Subject: initial sidepanel inventory xml changes

---
 .../skins/default/xui/en/sidepanel_inventory.xml   | 87 +++++++++++++++++++---
 1 file changed, 76 insertions(+), 11 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/sidepanel_inventory.xml b/indra/newview/skins/default/xui/en/sidepanel_inventory.xml
index 8997c1a6d7..5f6ef16cf0 100644
--- a/indra/newview/skins/default/xui/en/sidepanel_inventory.xml
+++ b/indra/newview/skins/default/xui/en/sidepanel_inventory.xml
@@ -19,17 +19,82 @@
 		 height="570"
 		 visible="true"
 		 width="330">
-		<panel
-			 class="panel_main_inventory"
-			 filename="panel_main_inventory.xml"
-			 follows="all"
-			 layout="topleft"
-			 left="0"
-			 name="panel_main_inventory"
-			 top="0"
-			 label=""
-			 height="545"
-			 width="330" />
+         <layout_stack
+              follows="left|right|top|bottom"
+              layout="topleft"
+              left="0"
+              top="0"
+              orientation="vertical"
+              name="inventory_layout_stack"
+              height="545"
+              width="330">
+             <layout_panel>
+                 <panel
+                      class="panel_main_inventory"
+                      filename="panel_main_inventory.xml"
+                      follows="all"
+                      layout="topleft"
+                      left="0"
+                      name="panel_main_inventory"
+                      top="0"
+                      label=""
+                      height="445"
+                      width="330" />
+             </layout_panel>
+             <layout_panel
+                 width="330"
+                  follows="bottom|left|right"
+                 height="100">
+                 <accordion
+                   follows="all"
+                   fit_parent="true"
+                   height="100"
+                   left="10"
+                   single_expansion="true"
+                   top="0"
+                   name="accordion"
+                   background_visible="true"
+                   bg_alpha_color="DkGray2"
+                   width="311">
+                     <accordion_tab
+                      name="tab_clothing"
+                      height="35"
+                      title="MARKETPLACE INBOX">
+                         <flat_list_view
+                          allow_select="true"
+                          follows="all"
+                          height="30"
+                          item_pad="3"
+                          keep_selection_visible_on_reshape="false"
+                          layout="topleft"
+                          left="0"
+                          multi_select="true"
+                          name="list_clothing"
+                          top="0"
+                          width="311" />
+                     </accordion_tab>
+                     <accordion_tab
+                      name="tab_attachments"
+                      title="MARKETPLACE OUTBOX">
+                         <flat_list_view
+                          allow_select="true"
+                          follows="all"
+                          height="30"
+                          item_pad="3"
+                          layout="topleft"
+                          left="0"
+                          keep_selection_visible_on_reshape="false"
+                          multi_select="true"
+                          name="list_attachments"
+                          top="0"
+                          width="311">
+                             <flat_list_view.no_items_text
+                              value="No attachments worn" />
+                         </flat_list_view>
+                     </accordion_tab>
+                 </accordion>
+             </layout_panel>
+         </layout_stack>
 		<panel
 		     follows="bottom|left|right"
 			 height="25"
-- 
cgit v1.2.3


From dfebb9ebb7333387d59aa7ba4e5926671d6681f5 Mon Sep 17 00:00:00 2001
From: Leyla Farazha <leyla@lindenlab.com>
Date: Tue, 17 May 2011 16:01:29 -0700
Subject: hooking up the marketplace inventory panel to the class

---
 .../skins/default/xui/en/sidepanel_inventory.xml   | 60 +++++++++++-----------
 1 file changed, 31 insertions(+), 29 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/sidepanel_inventory.xml b/indra/newview/skins/default/xui/en/sidepanel_inventory.xml
index 5f6ef16cf0..faf5e28bb8 100644
--- a/indra/newview/skins/default/xui/en/sidepanel_inventory.xml
+++ b/indra/newview/skins/default/xui/en/sidepanel_inventory.xml
@@ -28,7 +28,10 @@
               name="inventory_layout_stack"
               height="545"
               width="330">
-             <layout_panel>
+             <layout_panel
+                 width="330"
+                  follows="bottom|left|right"
+                 height="445">
                  <panel
                       class="panel_main_inventory"
                       filename="panel_main_inventory.xml"
@@ -45,6 +48,16 @@
                  width="330"
                   follows="bottom|left|right"
                  height="100">
+                 <panel
+                      class="panel_marketplace_inventory"
+                      follows="all"
+                      layout="topleft"
+                      left="0"
+                      name="panel_marketplace"
+                      top="0"
+                      label=""
+                      height="100"
+                      width="330">
                  <accordion
                    follows="all"
                    fit_parent="true"
@@ -58,41 +71,30 @@
                    width="311">
                      <accordion_tab
                       name="tab_clothing"
-                      height="35"
+                      height="35" 
+                      min_height="150"
+                      fit_panel="false"
                       title="MARKETPLACE INBOX">
-                         <flat_list_view
-                          allow_select="true"
-                          follows="all"
-                          height="30"
-                          item_pad="3"
-                          keep_selection_visible_on_reshape="false"
-                          layout="topleft"
-                          left="0"
-                          multi_select="true"
-                          name="list_clothing"
-                          top="0"
-                          width="311" />
+                        <view
+                            follows="all"
+                            left="0"
+                            height="40"
+                            top="0"
+                           />
                      </accordion_tab>
                      <accordion_tab
                       name="tab_attachments"
+                      fit_panel="false"
                       title="MARKETPLACE OUTBOX">
-                         <flat_list_view
-                          allow_select="true"
-                          follows="all"
-                          height="30"
-                          item_pad="3"
-                          layout="topleft"
-                          left="0"
-                          keep_selection_visible_on_reshape="false"
-                          multi_select="true"
-                          name="list_attachments"
-                          top="0"
-                          width="311">
-                             <flat_list_view.no_items_text
-                              value="No attachments worn" />
-                         </flat_list_view>
+                         <view
+                           follows="all"
+                           height="35"
+                           left="0"
+                           top="0"
+                           />
                      </accordion_tab>
                  </accordion>
+                 </panel>
              </layout_panel>
          </layout_stack>
 		<panel
-- 
cgit v1.2.3


From 03dca7cb7e578d20ec07298cecc47e0ae67aaaf5 Mon Sep 17 00:00:00 2001
From: Leyla Farazha <leyla@lindenlab.com>
Date: Tue, 17 May 2011 16:38:51 -0700
Subject: fixing llaccordian crash with multiple child panels

---
 .../skins/default/xui/en/sidepanel_inventory.xml   | 35 ++++++++++++++++++----
 1 file changed, 29 insertions(+), 6 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/sidepanel_inventory.xml b/indra/newview/skins/default/xui/en/sidepanel_inventory.xml
index faf5e28bb8..41b9283edc 100644
--- a/indra/newview/skins/default/xui/en/sidepanel_inventory.xml
+++ b/indra/newview/skins/default/xui/en/sidepanel_inventory.xml
@@ -75,12 +75,35 @@
                       min_height="150"
                       fit_panel="false"
                       title="MARKETPLACE INBOX">
-                        <view
-                            follows="all"
-                            left="0"
-                            height="40"
-                            top="0"
-                           />
+                         <panel
+                             follows="all"
+                             left="0"
+                             height="40"
+                             width="250"
+                             top="0"
+                           >
+                             <text
+                                 left ="40"
+                                 top="15"
+                                 height="14"
+                                 width="100"
+                                 >Just a panel</text>    
+                         </panel>
+                         <panel
+                     follows="all"
+                     left="0"
+                     height="40"
+                             visible="false"
+                     width="250"
+                     top="0"
+                           >
+                             <text
+                                 left ="40"
+                                 top="15"
+                                 height="14"
+                                 width="100"
+                                 >Just a panel 2</text>
+                         </panel>
                      </accordion_tab>
                      <accordion_tab
                       name="tab_attachments"
-- 
cgit v1.2.3


From 95b8020d21b1ad60f82c767df7d7aac019ad8353 Mon Sep 17 00:00:00 2001
From: Leyla Farazha <leyla@lindenlab.com>
Date: Mon, 23 May 2011 16:11:50 -0700
Subject: adding marketplace inbox and outbox reviewed by Leslie

---
 indra/newview/skins/default/textures/textures.xml  |   2 +
 .../textures/widgets/MarketplaceBtn_Off.png        | Bin 0 -> 711 bytes
 .../textures/widgets/MarketplaceBtn_Selected.png   | Bin 0 -> 702 bytes
 .../skins/default/xui/en/sidepanel_inventory.xml   | 139 ++++++++++++---------
 4 files changed, 85 insertions(+), 56 deletions(-)
 create mode 100644 indra/newview/skins/default/textures/widgets/MarketplaceBtn_Off.png
 create mode 100644 indra/newview/skins/default/textures/widgets/MarketplaceBtn_Selected.png

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

diff --git a/indra/newview/skins/default/textures/textures.xml b/indra/newview/skins/default/textures/textures.xml
index 1ca48b01a8..4f19dd9a6d 100644
--- a/indra/newview/skins/default/textures/textures.xml
+++ b/indra/newview/skins/default/textures/textures.xml
@@ -249,6 +249,8 @@ with the same filename but different name
 
   <texture name="Locked_Icon" file_name="icons/Locked_Icon.png" preload="false" />
 
+  <texture name="MarketplaceBtn_Off" file_name="widgets/MarketplaceBtn_Off.png" preload="true" scale.left="30" scale.top="19" scale.right="35" scale.bottom="4" />
+  <texture name="MarketplaceBtn_Selected" file_name="widgets/MarketplaceBtn_Selected.png" preload="true" scale.left="22" scale.top="16" scale.right="26" scale.bottom="7" />
 
   <texture name="Microphone_On" file_name="icons/Microphone_On.png" preload="false" />
 
diff --git a/indra/newview/skins/default/textures/widgets/MarketplaceBtn_Off.png b/indra/newview/skins/default/textures/widgets/MarketplaceBtn_Off.png
new file mode 100644
index 0000000000..e291a1c508
Binary files /dev/null and b/indra/newview/skins/default/textures/widgets/MarketplaceBtn_Off.png differ
diff --git a/indra/newview/skins/default/textures/widgets/MarketplaceBtn_Selected.png b/indra/newview/skins/default/textures/widgets/MarketplaceBtn_Selected.png
new file mode 100644
index 0000000000..33527f852b
Binary files /dev/null and b/indra/newview/skins/default/textures/widgets/MarketplaceBtn_Selected.png differ
diff --git a/indra/newview/skins/default/xui/en/sidepanel_inventory.xml b/indra/newview/skins/default/xui/en/sidepanel_inventory.xml
index 41b9283edc..a0caf80256 100644
--- a/indra/newview/skins/default/xui/en/sidepanel_inventory.xml
+++ b/indra/newview/skins/default/xui/en/sidepanel_inventory.xml
@@ -26,12 +26,12 @@
               top="0"
               orientation="vertical"
               name="inventory_layout_stack"
-              height="545"
+              height="540"
               width="330">
              <layout_panel
                  width="330"
                   follows="bottom|left|right"
-                 height="445">
+                 height="480">
                  <panel
                       class="panel_main_inventory"
                       filename="panel_main_inventory.xml"
@@ -41,92 +41,119 @@
                       name="panel_main_inventory"
                       top="0"
                       label=""
-                      height="445"
+                      height="480"
                       width="330" />
              </layout_panel>
              <layout_panel
                  width="330"
+                 auto_resize="true"
                   follows="bottom|left|right"
-                 height="100">
+                 min_dim="35"
+                 name="inbox_layout_panel"
+                 max_dim="125"
+                 height="35">
                  <panel
-                      class="panel_marketplace_inventory"
-                      follows="all"
+                      follows="top|left|right"
                       layout="topleft"
                       left="0"
-                      name="panel_marketplace"
+                      name="marketplace_inbox"
+                      class="panel_marketplace_inbox"
                       top="0"
                       label=""
-                      height="100"
+                      height="125"
                       width="330">
-                 <accordion
-                   follows="all"
-                   fit_parent="true"
-                   height="100"
-                   left="10"
-                   single_expansion="true"
-                   top="0"
-                   name="accordion"
-                   background_visible="true"
-                   bg_alpha_color="DkGray2"
-                   width="311">
-                     <accordion_tab
-                      name="tab_clothing"
-                      height="35" 
-                      min_height="150"
-                      fit_panel="false"
-                      title="MARKETPLACE INBOX">
+                     <button
+                         label="MARKETPLACE INBOX"
+                         name="inbox_btn"
+                         height="35"
+                         width="308"
+                         image_unselected="MarketplaceBtn_Off"
+                            image_selected="MarketplaceBtn_Selected"
+                         halign="left"
+                         follows="top|left|right"
+                         is_toggle="true"
+                         tab_stop="false"
+                         pad_left="35"
+                         top="0"
+                         left="10"
+                         ></button>
                          <panel
                              follows="all"
                              left="0"
-                             height="40"
+                             height="90"
                              width="250"
-                             top="0"
+                             top="30"
                            >
                              <text
                                  left ="40"
                                  top="15"
+                                 align="left"
                                  height="14"
                                  width="100"
                                  >Just a panel</text>    
                          </panel>
-                         <panel
-                     follows="all"
-                     left="0"
-                     height="40"
-                             visible="false"
-                     width="250"
-                     top="0"
+                     
+                 </panel>
+             </layout_panel>
+             <layout_panel
+  width="330"
+  auto_resize="true"
+   follows="bottom|left|right"
+  name="outbox_layout_panel"
+                 min_dim="35"
+                 max_dim="125"
+  height="35">
+                 <panel
+                      follows="top|left|right"
+                      layout="topleft"
+                      left="10"
+                      name="marketplace_outbox"
+                      class="panel_marketplace_outbox"
+                      top="0"
+                      label=""
+                      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>
+                     <panel
+                         follows="all"
+                         left="0"
+                         height="90"
+                         width="250"
+                         top="30"
                            >
-                             <text
-                                 left ="40"
-                                 top="15"
-                                 height="14"
-                                 width="100"
-                                 >Just a panel 2</text>
-                         </panel>
-                     </accordion_tab>
-                     <accordion_tab
-                      name="tab_attachments"
-                      fit_panel="false"
-                      title="MARKETPLACE OUTBOX">
-                         <view
-                           follows="all"
-                           height="35"
-                           left="0"
-                           top="0"
-                           />
-                     </accordion_tab>
-                 </accordion>
+                         <text
+                             left ="40"
+                             top="15"
+                             align="left"
+                             height="14"
+                             width="100"
+                                 >Just a panel</text>
+                     </panel>
+
                  </panel>
              </layout_panel>
          </layout_stack>
 		<panel
 		     follows="bottom|left|right"
-			 height="25"
+			 height="30"
 			 layout="topleft"
 			 name="button_panel"
 			 left="9"
-			 top_pad="-2"
+			 top_pad="2"
 			 width="308">
 			<layout_stack
      	         follows="bottom|left|right"
-- 
cgit v1.2.3


From 406195e4f20e0bea341c8a7a979b56a8259b8536 Mon Sep 17 00:00:00 2001
From: Leslie Linden <none@none>
Date: Tue, 24 May 2011 09:38:49 -0700
Subject: Added badges version 0.1 to buttons.

Reviewed by Richard
---
 indra/newview/skins/default/colors.xml                 |   6 ++++++
 indra/newview/skins/default/textures/textures.xml      |   2 ++
 indra/newview/skins/default/textures/widgets/Badge.png | Bin 0 -> 1716 bytes
 indra/newview/skins/default/xui/en/widgets/badge.xml   |  14 ++++++++++++++
 4 files changed, 22 insertions(+)
 create mode 100644 indra/newview/skins/default/textures/widgets/Badge.png
 create mode 100644 indra/newview/skins/default/xui/en/widgets/badge.xml

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

diff --git a/indra/newview/skins/default/colors.xml b/indra/newview/skins/default/colors.xml
index a19eccf748..0795e38366 100644
--- a/indra/newview/skins/default/colors.xml
+++ b/indra/newview/skins/default/colors.xml
@@ -132,6 +132,12 @@
     <color
      name="AvatarListItemIconVoiceLeftColor"
      reference="AvatarListItemIconOfflineColor" />
+    <color
+     name="BadgeImageColor"
+     value="0.25 0.85 0.25 1.0" />
+    <color
+     name="BadgeLabelColor"
+     reference="White" />
     <color
      name="ButtonBorderColor"
      reference="Unused?" />
diff --git a/indra/newview/skins/default/textures/textures.xml b/indra/newview/skins/default/textures/textures.xml
index 4f19dd9a6d..2a78337f65 100644
--- a/indra/newview/skins/default/textures/textures.xml
+++ b/indra/newview/skins/default/textures/textures.xml
@@ -72,6 +72,8 @@ with the same filename but different name
   <texture name="BackButton_Over" file_name="icons/back_arrow_over.png" preload="false" scale.left="22" scale.top="12" scale.right="25" scale.bottom="12" />
   <texture name="BackButton_Press" file_name="icons/back_arrow_press.png" preload="false" scale.left="22" scale.top="12" scale.right="25" scale.bottom="12" />
 
+  <texture name="Badge" file_name="widgets/Badge.png" preload="true" scale.left="9" scale.top="12" scale.right="248" scale.bottom="12" />
+
   <texture name="Blank" file_name="Blank.png" preload="false" />
 
 
diff --git a/indra/newview/skins/default/textures/widgets/Badge.png b/indra/newview/skins/default/textures/widgets/Badge.png
new file mode 100644
index 0000000000..afda6b66b9
Binary files /dev/null and b/indra/newview/skins/default/textures/widgets/Badge.png differ
diff --git a/indra/newview/skins/default/xui/en/widgets/badge.xml b/indra/newview/skins/default/xui/en/widgets/badge.xml
new file mode 100644
index 0000000000..4eb633ac0c
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/widgets/badge.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<!-- Additional attributes:
+   -->
+<badge font="SansSerifSmall"
+       image="Badge"
+       image_color="BadgeImageColor"
+       label_color="BadgeLabelColor"
+       location="top_left"
+       location_percent_hcenter="85"
+       location_percent_vcenter="85"
+       padding_horiz="7"
+       padding_vert="4"
+       >
+</badge>
-- 
cgit v1.2.3


From 610b15aee47c5fae9df45b2d5ae515fd06b5a536 Mon Sep 17 00:00:00 2001
From: Leslie Linden <none@none>
Date: Wed, 25 May 2011 10:30:44 -0700
Subject: Updated badge to different art that is opaque

---
 indra/newview/skins/default/textures/widgets/Badge.png | Bin 1716 -> 958 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

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

diff --git a/indra/newview/skins/default/textures/widgets/Badge.png b/indra/newview/skins/default/textures/widgets/Badge.png
index afda6b66b9..862b13d219 100644
Binary files a/indra/newview/skins/default/textures/widgets/Badge.png and b/indra/newview/skins/default/textures/widgets/Badge.png differ
-- 
cgit v1.2.3


From 33e4a2c7b1ab3a06f1adb5edd9850523c897ea77 Mon Sep 17 00:00:00 2001
From: Leslie Linden <none@none>
Date: Wed, 25 May 2011 10:39:34 -0700
Subject: Updated Marketplace Inbox & Outbox panel to maintain size when one is
 expanded vs the other

---
 .../skins/default/xui/en/sidepanel_inventory.xml   | 403 +++++++++++----------
 1 file changed, 207 insertions(+), 196 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/sidepanel_inventory.xml b/indra/newview/skins/default/xui/en/sidepanel_inventory.xml
index a0caf80256..ce5cf4c622 100644
--- a/indra/newview/skins/default/xui/en/sidepanel_inventory.xml
+++ b/indra/newview/skins/default/xui/en/sidepanel_inventory.xml
@@ -9,170 +9,181 @@
 	  min_width="240"
 	  name="objects panel"
 	  width="333">
-	 <panel
-		 follows="all"
-		 layout="topleft"
-		 left="0"
-		 name="sidepanel__inventory_panel"
-		 top="0"
-		 label=""
-		 height="570"
-		 visible="true"
-		 width="330">
-         <layout_stack
-              follows="left|right|top|bottom"
-              layout="topleft"
-              left="0"
-              top="0"
-              orientation="vertical"
-              name="inventory_layout_stack"
-              height="540"
-              width="330">
-             <layout_panel
-                 width="330"
-                  follows="bottom|left|right"
-                 height="480">
-                 <panel
-                      class="panel_main_inventory"
-                      filename="panel_main_inventory.xml"
-                      follows="all"
-                      layout="topleft"
-                      left="0"
-                      name="panel_main_inventory"
-                      top="0"
-                      label=""
-                      height="480"
-                      width="330" />
-             </layout_panel>
-             <layout_panel
-                 width="330"
-                 auto_resize="true"
-                  follows="bottom|left|right"
-                 min_dim="35"
-                 name="inbox_layout_panel"
-                 max_dim="125"
-                 height="35">
-                 <panel
-                      follows="top|left|right"
-                      layout="topleft"
-                      left="0"
-                      name="marketplace_inbox"
-                      class="panel_marketplace_inbox"
-                      top="0"
-                      label=""
-                      height="125"
-                      width="330">
-                     <button
-                         label="MARKETPLACE INBOX"
-                         name="inbox_btn"
-                         height="35"
-                         width="308"
-                         image_unselected="MarketplaceBtn_Off"
-                            image_selected="MarketplaceBtn_Selected"
-                         halign="left"
-                         follows="top|left|right"
-                         is_toggle="true"
-                         tab_stop="false"
-                         pad_left="35"
-                         top="0"
-                         left="10"
-                         ></button>
-                         <panel
-                             follows="all"
-                             left="0"
-                             height="90"
-                             width="250"
-                             top="30"
-                           >
-                             <text
-                                 left ="40"
-                                 top="15"
-                                 align="left"
-                                 height="14"
-                                 width="100"
-                                 >Just a panel</text>    
-                         </panel>
-                     
-                 </panel>
-             </layout_panel>
-             <layout_panel
-  width="330"
-  auto_resize="true"
-   follows="bottom|left|right"
-  name="outbox_layout_panel"
-                 min_dim="35"
-                 max_dim="125"
-  height="35">
-                 <panel
-                      follows="top|left|right"
-                      layout="topleft"
-                      left="10"
-                      name="marketplace_outbox"
-                      class="panel_marketplace_outbox"
-                      top="0"
-                      label=""
-                      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>
-                     <panel
-                         follows="all"
-                         left="0"
-                         height="90"
-                         width="250"
-                         top="30"
+    <panel
+        follows="all"
+        layout="topleft"
+        left="0"
+        name="sidepanel__inventory_panel"
+        top="0"
+        label=""
+        height="570"
+        visible="true"
+        width="330">
+        <layout_stack
+             follows="left|right|top|bottom"
+             layout="topleft"
+             left="0"
+             top="0"
+             orientation="vertical"
+             name="inventory_layout_stack"
+             height="535"
+             width="330">
+            <layout_panel
+                width="330"
+                follows="bottom|left|right"
+                height="480">
+                <panel
+                     class="panel_main_inventory"
+                     filename="panel_main_inventory.xml"
+                     follows="all"
+                     layout="topleft"
+                     left="0"
+                     name="panel_main_inventory"
+                     top="0"
+                     label=""
+                     height="480"
+                     width="330" />
+            </layout_panel>
+            <layout_panel
+                width="330"
+                auto_resize="true"
+                user_resize="false"
+                follows="bottom|left|right"
+                min_dim="35"
+                name="inbox_layout_panel"
+                max_dim="125"
+                height="35">
+                <panel
+                     follows="top|left|right"
+                     layout="topleft"
+                     left="0"
+                     name="marketplace_inbox"
+                     class="panel_marketplace_inbox"
+                     top="0"
+                     label=""
+                     height="125"
+                     width="330">
+                    <button
+                        label="MARKETPLACE INBOX"
+                        name="inbox_btn"
+                        height="35"
+                        width="308"
+                        image_unselected="MarketplaceBtn_Off"
+                        image_selected="MarketplaceBtn_Selected"
+                        halign="left"
+                        follows="top|left|right"
+                        is_toggle="true"
+                        tab_stop="false"
+                        pad_left="35"
+                        top="0"
+                        left="10" />
+                    <panel
+                        follows="all"
+                        left="0"
+                        height="90"
+                        width="250"
+                        top="30"
+                            >
+                        <text
+                            left ="40"
+                            top="15"
+                            align="left"
+                            height="14"
+                            width="100"
+                                 >Just a panel</text>
+                    </panel>
+                </panel>
+            </layout_panel>
+            <layout_panel
+                width="330"
+                auto_resize="true"
+                user_resize="false"
+                follows="bottom|left|right"
+                name="outbox_layout_panel"
+                min_dim="35"
+                max_dim="125"
+                height="35">
+                <panel
+                     follows="top|left|right"
+                     layout="topleft"
+                     left="10"
+                     name="marketplace_outbox"
+                     class="panel_marketplace_outbox"
+                     top="0"
+                     label=""
+                     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
+                        label="SYNC"
+                        is_toggle="false"
+                        name="outbox_sync_btn"
+                        follows="top|right"
+                        height="25"
+                        tab_stop="false"
+                        width="45"
+                        halign="center"
+                        top="5"
+                        left="-50"
+                        enabled="false" />
+                    <panel
+                        follows="all"
+                        left="0"
+                        height="90"
+                        width="250"
+                        top="30"
                            >
-                         <text
-                             left ="40"
-                             top="15"
-                             align="left"
-                             height="14"
-                             width="100"
+                        <text
+                            left ="40"
+                            top="15"
+                            align="left"
+                            height="14"
+                            width="100"
                                  >Just a panel</text>
-                     </panel>
+                    </panel>
 
-                 </panel>
-             </layout_panel>
-         </layout_stack>
-		<panel
-		     follows="bottom|left|right"
-			 height="30"
-			 layout="topleft"
-			 name="button_panel"
-			 left="9"
-			 top_pad="2"
-			 width="308">
-			<layout_stack
-     	         follows="bottom|left|right"
-		         height="23"
-		         layout="topleft"
-		         mouse_opaque="false"
-		         name="button_panel_ls"
-		         left="0"
-		         orientation="horizontal"
-		         top="0"
-		         width="308">	
-			    <layout_panel
-			         follows="bottom|left|right"
-			         height="23"
+                </panel>
+            </layout_panel>
+        </layout_stack>
+        <panel
+             follows="bottom|left|right"
+             height="30"
+             layout="topleft"
+             name="button_panel"
+             left="9"
+             top_pad="7"
+             width="308">
+            <layout_stack
+                 follows="bottom|left|right"
+                 height="23"
+                 layout="topleft"
+                 mouse_opaque="false"
+                 name="button_panel_ls"
+                 left="0"
+                 orientation="horizontal"
+                 top="0"
+                 width="308">
+                <layout_panel
+                     follows="bottom|left|right"
+                     height="23"
                      layout="bottomleft"
-                     left="0"			
+                     left="0"
                      mouse_opaque="false"
                      name="info_btn_lp"
-                     user_resize="false" 
+                     user_resize="false"
                      auto_resize="true"
                      width="101">
                     <button
@@ -186,15 +197,15 @@
                          tool_tip="Show object profile"
                          top="0"
                          width="100" />
-			    </layout_panel>
-			    <layout_panel
+                </layout_panel>
+                <layout_panel
                      follows="bottom|left|right"
                      height="23"
                      layout="bottomleft"
-                     left_pad="1"			
+                     left_pad="1"
                      mouse_opaque="false"
                      name="share_btn_lp"
-                     user_resize="false" 
+                     user_resize="false"
                      auto_resize="true"
                      width="100">
                     <button
@@ -208,15 +219,15 @@
                          tool_tip="Share an inventory item"
                          top="0"
                          width="99" />
-			    </layout_panel>
-			    <layout_panel
+                </layout_panel>
+                <layout_panel
                      follows="bottom|left|right"
                      height="23"
                      layout="bottomleft"
-                     left_pad="1"			
+                     left_pad="1"
                      mouse_opaque="false"
                      name="shop_btn_lp"
-                     user_resize="false" 
+                     user_resize="false"
                      auto_resize="true"
                      width="100">
                     <button
@@ -262,36 +273,36 @@
                          tool_tip="Teleport to the selected area"
                          top="0"
                          width="99" />
-			    </layout_panel>
-			</layout_stack>
-		</panel>
-	</panel>
+                </layout_panel>
+            </layout_stack>
+        </panel>
+    </panel>
 
-<panel
-		 follows="all"
-		 layout="topleft"
-		 left="0"
-		 class="sidepanel_item_info"
-		 filename="sidepanel_item_info.xml"
-		 name="sidepanel__item_panel"
-		 top="0"
-		 label=""
-		 height="570"
-		 visible="false"
-		 width="330">
-	</panel>
+    <panel
+             follows="all"
+             layout="topleft"
+             left="0"
+             class="sidepanel_item_info"
+             filename="sidepanel_item_info.xml"
+             name="sidepanel__item_panel"
+             top="0"
+             label=""
+             height="570"
+             visible="false"
+             width="330">
+    </panel>
 
-<panel
-		 follows="all"
-		 layout="topleft"
-		 left="0"
-		 class="sidepanel_task_info"
-		 filename="sidepanel_task_info.xml"
-		 name="sidepanel__task_panel"
-		 top="0"
-		 label=""
-		 height="570"
-		 visible="false"
-		 width="330">
-	</panel>
+    <panel
+             follows="all"
+             layout="topleft"
+             left="0"
+             class="sidepanel_task_info"
+             filename="sidepanel_task_info.xml"
+             name="sidepanel__task_panel"
+             top="0"
+             label=""
+             height="570"
+             visible="false"
+             width="330">
+    </panel>
 </panel>
-- 
cgit v1.2.3


From f8907b327bb0009047b9cef54fde3d7dc6e8d6ca Mon Sep 17 00:00:00 2001
From: Leyla Farazha <leyla@lindenlab.com>
Date: Wed, 25 May 2011 11:17:47 -0700
Subject: hooking up marketplace inbox to inventory

---
 indra/newview/skins/default/textures/textures.xml  |   2 +-
 .../textures/widgets/MarketplaceBtn_Off.png        | Bin 711 -> 1067 bytes
 .../textures/widgets/MarketplaceBtn_Selected.png   | Bin 702 -> 1086 bytes
 .../skins/default/xui/en/sidepanel_inventory.xml   |  32 ++++++++++++++-------
 4 files changed, 22 insertions(+), 12 deletions(-)

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

diff --git a/indra/newview/skins/default/textures/textures.xml b/indra/newview/skins/default/textures/textures.xml
index 4f19dd9a6d..ec12d996bf 100644
--- a/indra/newview/skins/default/textures/textures.xml
+++ b/indra/newview/skins/default/textures/textures.xml
@@ -250,7 +250,7 @@ with the same filename but different name
   <texture name="Locked_Icon" file_name="icons/Locked_Icon.png" preload="false" />
 
   <texture name="MarketplaceBtn_Off" file_name="widgets/MarketplaceBtn_Off.png" preload="true" scale.left="30" scale.top="19" scale.right="35" scale.bottom="4" />
-  <texture name="MarketplaceBtn_Selected" file_name="widgets/MarketplaceBtn_Selected.png" preload="true" scale.left="22" scale.top="16" scale.right="26" scale.bottom="7" />
+  <texture name="MarketplaceBtn_Selected" file_name="widgets/MarketplaceBtn_Selected.png" preload="true" scale.left="30" scale.top="19" scale.right="35" scale.bottom="4" />
 
   <texture name="Microphone_On" file_name="icons/Microphone_On.png" preload="false" />
 
diff --git a/indra/newview/skins/default/textures/widgets/MarketplaceBtn_Off.png b/indra/newview/skins/default/textures/widgets/MarketplaceBtn_Off.png
index e291a1c508..e603c44384 100644
Binary files a/indra/newview/skins/default/textures/widgets/MarketplaceBtn_Off.png and b/indra/newview/skins/default/textures/widgets/MarketplaceBtn_Off.png differ
diff --git a/indra/newview/skins/default/textures/widgets/MarketplaceBtn_Selected.png b/indra/newview/skins/default/textures/widgets/MarketplaceBtn_Selected.png
index 33527f852b..fbc164123f 100644
Binary files a/indra/newview/skins/default/textures/widgets/MarketplaceBtn_Selected.png and b/indra/newview/skins/default/textures/widgets/MarketplaceBtn_Selected.png differ
diff --git a/indra/newview/skins/default/xui/en/sidepanel_inventory.xml b/indra/newview/skins/default/xui/en/sidepanel_inventory.xml
index a0caf80256..7663db2756 100644
--- a/indra/newview/skins/default/xui/en/sidepanel_inventory.xml
+++ b/indra/newview/skins/default/xui/en/sidepanel_inventory.xml
@@ -53,7 +53,7 @@
                  max_dim="125"
                  height="35">
                  <panel
-                      follows="top|left|right"
+                      follows="all"
                       layout="topleft"
                       left="0"
                       name="marketplace_inbox"
@@ -79,18 +79,28 @@
                          ></button>
                          <panel
                              follows="all"
-                             left="0"
+                             left="10"
                              height="90"
-                             width="250"
-                             top="30"
+                             width="330"
+                             top="35"
                            >
-                             <text
-                                 left ="40"
-                                 top="15"
-                                 align="left"
-                                 height="14"
-                                 width="100"
-                                 >Just a panel</text>    
+                             <inventory_panel
+                                bg_opaque_color="DkGray2"
+                                bg_alpha_color="DkGray2"
+                                background_visible="true"
+                                background_opaque="true"
+                                border="false"
+                                bevel_style="none"
+                                follows="all"
+                                height="90"
+                                start_folder="Inbox"
+                                layout="topleft"
+                                left="0"
+                                name="All Items"
+                                sort_order_setting="InventorySortOrder"
+                                show_item_link_overlays="true"
+                                top="0"
+                                width="308" />   
                          </panel>
                      
                  </panel>
-- 
cgit v1.2.3


From 4415c8505fd5c2bb0af6ec1324cee3d1ef6e8c78 Mon Sep 17 00:00:00 2001
From: Leyla Farazha <leyla@lindenlab.com>
Date: Mon, 30 May 2011 16:42:24 -0700
Subject: Adding the outbox

---
 .../skins/default/xui/en/sidepanel_inventory.xml   | 32 ++++++++++++++--------
 1 file changed, 21 insertions(+), 11 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/sidepanel_inventory.xml b/indra/newview/skins/default/xui/en/sidepanel_inventory.xml
index fa79975669..5f90a74e74 100644
--- a/indra/newview/skins/default/xui/en/sidepanel_inventory.xml
+++ b/indra/newview/skins/default/xui/en/sidepanel_inventory.xml
@@ -96,7 +96,7 @@
                                 start_folder="Inbox"
                                 layout="topleft"
                                 left="0"
-                                name="All Items"
+                                name="inventory_inbox"
                                 sort_order_setting="InventorySortOrder"
                                 show_item_link_overlays="true"
                                 top="0"
@@ -114,7 +114,7 @@
                  max_dim="125"
   height="35">
                  <panel
-                      follows="top|left|right"
+                      follows="all"
                       layout="topleft"
                       left="10"
                       name="marketplace_outbox"
@@ -153,16 +153,26 @@
                          follows="all"
                          left="0"
                          height="90"
-                         width="250"
-                         top="30"
+                         width="330"
+                         top="35"
                            >
-                         <text
-                             left ="40"
-                             top="15"
-                             align="left"
-                             height="14"
-                             width="100"
-                                 >Just a panel</text>
+                         <inventory_panel
+                              bg_opaque_color="DkGray2"
+                              bg_alpha_color="DkGray2"
+                              background_visible="true"
+                              background_opaque="true"
+                              border="false"
+                              bevel_style="none"
+                              follows="all"
+                              height="90"
+                              start_folder="Outbox"
+                              layout="topleft"
+                              left="0"
+                              name="inventory_outbox"
+                              sort_order_setting="InventorySortOrder"
+                              show_item_link_overlays="true"
+                              top="0"
+                              width="308" />
                      </panel>
 
                  </panel>
-- 
cgit v1.2.3


From ee1ba4d85c9e36e1563de5019c6ececa1f1c2d54 Mon Sep 17 00:00:00 2001
From: Leyla Farazha <leyla@lindenlab.com>
Date: Tue, 31 May 2011 15:11:55 -0700
Subject: adding inbox/outbox creation options

---
 .../newview/skins/default/xui/en/menu_inventory_add.xml  | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

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

diff --git a/indra/newview/skins/default/xui/en/menu_inventory_add.xml b/indra/newview/skins/default/xui/en/menu_inventory_add.xml
index 90e8db3709..30eff8e6a7 100644
--- a/indra/newview/skins/default/xui/en/menu_inventory_add.xml
+++ b/indra/newview/skins/default/xui/en/menu_inventory_add.xml
@@ -67,6 +67,22 @@
                  function="Inventory.DoCreate"
                  parameter="category" />
             </menu_item_call>
+    <menu_item_call
+                    label="Inbox"
+                   layout="topleft"
+                    name="Inbox">
+               <menu_item_call.on_click
+     function="Inventory.DoCreate"
+     parameter="inbox" />
+</menu_item_call>
+           <menu_item_call
+                 label="Outbox"
+                 layout="topleft"
+                 name="Outbox">
+             <menu_item_call.on_click
+     function="Inventory.DoCreate"
+     parameter="outbox" />
+</menu_item_call>
             <menu_item_call
              label="New Script"
              layout="topleft"
-- 
cgit v1.2.3


From cbf38d7c95e5968f47850d082eee223e1cef1aff Mon Sep 17 00:00:00 2001
From: Leslie Linden <none@none>
Date: Wed, 1 Jun 2011 12:28:49 -0700
Subject: EXP-841 FIX -- Create outbox sync button with basic enable/disable
 logic and animation

Functions are stubbed out.  Time delay happens through basic coroutine to allow animation viewing.

Reviewed by Leyla
---
 indra/newview/skins/default/colors.xml             |   5 +-
 .../skins/default/textures/icons/Inv_Gift.png      | Bin 0 -> 1335 bytes
 .../skins/default/textures/icons/Sync_Disabled.png | Bin 0 -> 1187 bytes
 .../skins/default/textures/icons/Sync_Enabled.png  | Bin 0 -> 1168 bytes
 .../default/textures/icons/Sync_Progress_1.png     | Bin 0 -> 1149 bytes
 .../default/textures/icons/Sync_Progress_2.png     | Bin 0 -> 1147 bytes
 .../default/textures/icons/Sync_Progress_3.png     | Bin 0 -> 1211 bytes
 .../default/textures/icons/Sync_Progress_4.png     | Bin 0 -> 1205 bytes
 .../default/textures/icons/Sync_Progress_5.png     | Bin 0 -> 1137 bytes
 .../default/textures/icons/Sync_Progress_6.png     | Bin 0 -> 1164 bytes
 indra/newview/skins/default/textures/textures.xml  |  15 ++++-
 .../skins/default/textures/widgets/Badge.png       | Bin 958 -> 0 bytes
 .../default/textures/widgets/Badge_Background.png  | Bin 0 -> 1352 bytes
 .../default/textures/widgets/Badge_Border.png      | Bin 0 -> 1565 bytes
 .../skins/default/xui/en/sidepanel_inventory.xml   |  69 ++++++++++++++-------
 .../newview/skins/default/xui/en/widgets/badge.xml |   2 +-
 16 files changed, 63 insertions(+), 28 deletions(-)
 create mode 100644 indra/newview/skins/default/textures/icons/Inv_Gift.png
 create mode 100644 indra/newview/skins/default/textures/icons/Sync_Disabled.png
 create mode 100644 indra/newview/skins/default/textures/icons/Sync_Enabled.png
 create mode 100644 indra/newview/skins/default/textures/icons/Sync_Progress_1.png
 create mode 100644 indra/newview/skins/default/textures/icons/Sync_Progress_2.png
 create mode 100644 indra/newview/skins/default/textures/icons/Sync_Progress_3.png
 create mode 100644 indra/newview/skins/default/textures/icons/Sync_Progress_4.png
 create mode 100644 indra/newview/skins/default/textures/icons/Sync_Progress_5.png
 create mode 100644 indra/newview/skins/default/textures/icons/Sync_Progress_6.png
 delete mode 100644 indra/newview/skins/default/textures/widgets/Badge.png
 create mode 100644 indra/newview/skins/default/textures/widgets/Badge_Background.png
 create mode 100644 indra/newview/skins/default/textures/widgets/Badge_Border.png

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

diff --git a/indra/newview/skins/default/colors.xml b/indra/newview/skins/default/colors.xml
index 0795e38366..a548849d60 100644
--- a/indra/newview/skins/default/colors.xml
+++ b/indra/newview/skins/default/colors.xml
@@ -134,7 +134,10 @@
      reference="AvatarListItemIconOfflineColor" />
     <color
      name="BadgeImageColor"
-     value="0.25 0.85 0.25 1.0" />
+     value="0.44 0.69 0.56 1.0" />
+    <color
+     name="BadgeImageBorderColor"
+     value="0.9 0.9 0.9 1.0" />
     <color
      name="BadgeLabelColor"
      reference="White" />
diff --git a/indra/newview/skins/default/textures/icons/Inv_Gift.png b/indra/newview/skins/default/textures/icons/Inv_Gift.png
new file mode 100644
index 0000000000..5afe85d72d
Binary files /dev/null and b/indra/newview/skins/default/textures/icons/Inv_Gift.png differ
diff --git a/indra/newview/skins/default/textures/icons/Sync_Disabled.png b/indra/newview/skins/default/textures/icons/Sync_Disabled.png
new file mode 100644
index 0000000000..ca2e8def97
Binary files /dev/null and b/indra/newview/skins/default/textures/icons/Sync_Disabled.png differ
diff --git a/indra/newview/skins/default/textures/icons/Sync_Enabled.png b/indra/newview/skins/default/textures/icons/Sync_Enabled.png
new file mode 100644
index 0000000000..bc236c8b98
Binary files /dev/null and b/indra/newview/skins/default/textures/icons/Sync_Enabled.png differ
diff --git a/indra/newview/skins/default/textures/icons/Sync_Progress_1.png b/indra/newview/skins/default/textures/icons/Sync_Progress_1.png
new file mode 100644
index 0000000000..624e556376
Binary files /dev/null and b/indra/newview/skins/default/textures/icons/Sync_Progress_1.png differ
diff --git a/indra/newview/skins/default/textures/icons/Sync_Progress_2.png b/indra/newview/skins/default/textures/icons/Sync_Progress_2.png
new file mode 100644
index 0000000000..5769803b3f
Binary files /dev/null and b/indra/newview/skins/default/textures/icons/Sync_Progress_2.png differ
diff --git a/indra/newview/skins/default/textures/icons/Sync_Progress_3.png b/indra/newview/skins/default/textures/icons/Sync_Progress_3.png
new file mode 100644
index 0000000000..92d4bfb020
Binary files /dev/null and b/indra/newview/skins/default/textures/icons/Sync_Progress_3.png differ
diff --git a/indra/newview/skins/default/textures/icons/Sync_Progress_4.png b/indra/newview/skins/default/textures/icons/Sync_Progress_4.png
new file mode 100644
index 0000000000..6d43eb3a9f
Binary files /dev/null and b/indra/newview/skins/default/textures/icons/Sync_Progress_4.png differ
diff --git a/indra/newview/skins/default/textures/icons/Sync_Progress_5.png b/indra/newview/skins/default/textures/icons/Sync_Progress_5.png
new file mode 100644
index 0000000000..766d063c99
Binary files /dev/null and b/indra/newview/skins/default/textures/icons/Sync_Progress_5.png differ
diff --git a/indra/newview/skins/default/textures/icons/Sync_Progress_6.png b/indra/newview/skins/default/textures/icons/Sync_Progress_6.png
new file mode 100644
index 0000000000..dfe7f68b72
Binary files /dev/null and b/indra/newview/skins/default/textures/icons/Sync_Progress_6.png differ
diff --git a/indra/newview/skins/default/textures/textures.xml b/indra/newview/skins/default/textures/textures.xml
index f0a1893502..a6e71cc38e 100644
--- a/indra/newview/skins/default/textures/textures.xml
+++ b/indra/newview/skins/default/textures/textures.xml
@@ -72,11 +72,11 @@ with the same filename but different name
   <texture name="BackButton_Over" file_name="icons/back_arrow_over.png" preload="false" scale.left="22" scale.top="12" scale.right="25" scale.bottom="12" />
   <texture name="BackButton_Press" file_name="icons/back_arrow_press.png" preload="false" scale.left="22" scale.top="12" scale.right="25" scale.bottom="12" />
 
-  <texture name="Badge" file_name="widgets/Badge.png" preload="true" scale.left="9" scale.top="12" scale.right="248" scale.bottom="12" />
+  <texture name="Badge_Background" file_name="widgets/Badge_Background.png" preload="true" scale.left="9" scale.top="12" scale.right="248" scale.bottom="12" />
+  <texture name="Badge_Border" file_name="widgets/Badge_Border.png" preload="true" scale.left="9" scale.top="12" scale.right="248" scale.bottom="12" />
 
   <texture name="Blank" file_name="Blank.png" preload="false" />
 
-
   <texture name="BuyArrow_Over" file_name="navbar/BuyArrow_Over.png" preload="true" scale.left="0" scale.top="1" scale.right="0" scale.bottom="0"  />
   <texture name="BuyArrow_Press" file_name="navbar/BuyArrow_Press.png" preload="true" scale.left="1" scale.top="1" scale.right="0" scale.bottom="0"  />
 
@@ -479,7 +479,16 @@ with the same filename but different name
   <texture name="StopReload_Off" file_name="icons/StopReload_Off.png" preload="false" />
   <texture name="StopReload_Over" file_name="icons/StopReload_Over.png" preload="false" />
 
-  <texture name="TabIcon_Appearance_Off" file_name="taskpanel/TabIcon_Appearance_Off.png" preload="false" />
+  <texture name="Sync_Disabled" file_name="icons/Sync_Disabled.png" preload="true" />
+  <texture name="Sync_Enabled" file_name="icons/Sync_Enabled.png" preload="true" />
+  <texture name="Sync_Progress_1" file_name="icons/Sync_Progress_1.png" preload="true" />
+  <texture name="Sync_Progress_2" file_name="icons/Sync_Progress_2.png" preload="true" />
+  <texture name="Sync_Progress_3" file_name="icons/Sync_Progress_3.png" preload="true" />
+  <texture name="Sync_Progress_4" file_name="icons/Sync_Progress_4.png" preload="true" />
+  <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_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/textures/widgets/Badge.png b/indra/newview/skins/default/textures/widgets/Badge.png
deleted file mode 100644
index 862b13d219..0000000000
Binary files a/indra/newview/skins/default/textures/widgets/Badge.png and /dev/null differ
diff --git a/indra/newview/skins/default/textures/widgets/Badge_Background.png b/indra/newview/skins/default/textures/widgets/Badge_Background.png
new file mode 100644
index 0000000000..5089c30312
Binary files /dev/null and b/indra/newview/skins/default/textures/widgets/Badge_Background.png differ
diff --git a/indra/newview/skins/default/textures/widgets/Badge_Border.png b/indra/newview/skins/default/textures/widgets/Badge_Border.png
new file mode 100644
index 0000000000..4b086a63fb
Binary files /dev/null and b/indra/newview/skins/default/textures/widgets/Badge_Border.png differ
diff --git a/indra/newview/skins/default/xui/en/sidepanel_inventory.xml b/indra/newview/skins/default/xui/en/sidepanel_inventory.xml
index fa79975669..ffc018b856 100644
--- a/indra/newview/skins/default/xui/en/sidepanel_inventory.xml
+++ b/indra/newview/skins/default/xui/en/sidepanel_inventory.xml
@@ -124,37 +124,60 @@
                       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"
+                        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
-                        label="SYNC"
+                   <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="25"
+                        height="16"
                         tab_stop="false"
-                        width="45"
+                        width="16"
                         halign="center"
-                        top="5"
-                        left="-50"
+                        top="10"
+                        left="-40"
                         enabled="false" />
+                     <loading_indicator
+                        follows="top|right"
+                        name="outbox_sync_indicator"
+                        top="10"
+                        left="-40"
+                        height="16"
+                        width="16"
+                        images_per_sec="1.0"
+                        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"/>
+                         </images>
+                     </loading_indicator>
                      <panel
-                         follows="all"
-                         left="0"
-                         height="90"
-                         width="250"
-                         top="30"
+                        follows="all"
+                        left="0"
+                        height="90"
+                        width="250"
+                        top="30"
                            >
                          <text
                              left ="40"
diff --git a/indra/newview/skins/default/xui/en/widgets/badge.xml b/indra/newview/skins/default/xui/en/widgets/badge.xml
index 4eb633ac0c..ceec09d1e4 100644
--- a/indra/newview/skins/default/xui/en/widgets/badge.xml
+++ b/indra/newview/skins/default/xui/en/widgets/badge.xml
@@ -2,7 +2,7 @@
 <!-- Additional attributes:
    -->
 <badge font="SansSerifSmall"
-       image="Badge"
+       image="Badge_Background"
        image_color="BadgeImageColor"
        label_color="BadgeLabelColor"
        location="top_left"
-- 
cgit v1.2.3


From 651a9587f82a143764856a4c2603d89c5d392cb6 Mon Sep 17 00:00:00 2001
From: Leslie Linden <none@none>
Date: Wed, 1 Jun 2011 13:50:14 -0700
Subject: EXP-862 FIX -- Disable marketplace inbox/outbox panel separator when
 inbox and outbox are collapsed

Marketplace panel is only resizable now when inbox or outbox is expanded.

Reviewed by Leyla
---
 .../skins/default/xui/en/sidepanel_inventory.xml   | 41 ++++++++++++----------
 1 file changed, 22 insertions(+), 19 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/sidepanel_inventory.xml b/indra/newview/skins/default/xui/en/sidepanel_inventory.xml
index ffc018b856..484e90f083 100644
--- a/indra/newview/skins/default/xui/en/sidepanel_inventory.xml
+++ b/indra/newview/skins/default/xui/en/sidepanel_inventory.xml
@@ -26,11 +26,14 @@
               top="0"
               orientation="vertical"
               name="inventory_layout_stack"
-             height="535"
+              height="535"
               width="330">
              <layout_panel
+                 name="main_inventory_layout_panel"
+                 min_dim="150"
                  width="330"
-                  follows="bottom|left|right"
+                 follows="bottom|left|right"
+                 user_resize="false"
                  height="480">
                  <panel
                       class="panel_main_inventory"
@@ -45,14 +48,14 @@
                       width="330" />
              </layout_panel>
              <layout_panel
-                 width="330"
-                 auto_resize="true"
-                user_resize="false"
-                  follows="bottom|left|right"
-                 min_dim="35"
-                 name="inbox_layout_panel"
-                 max_dim="125"
-                 height="35">
+                    width="330"
+                    auto_resize="true"
+                    user_resize="false"
+                    follows="bottom|left|right"
+                    min_dim="35"
+                    name="inbox_layout_panel"
+                    max_dim="125"
+                    height="35">
                  <panel
                       follows="all"
                       layout="topleft"
@@ -69,14 +72,14 @@
                          height="35"
                          width="308"
                          image_unselected="MarketplaceBtn_Off"
-                            image_selected="MarketplaceBtn_Selected"
+                         image_selected="MarketplaceBtn_Selected"
                          halign="left"
                          follows="top|left|right"
                          is_toggle="true"
                          tab_stop="false"
                          pad_left="35"
                          top="0"
-                        left="10" />
+                         left="10" />
                          <panel
                              follows="all"
                              left="10"
@@ -105,14 +108,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="top|left|right"
                       layout="topleft"
-- 
cgit v1.2.3


From 0c0f7558782edccda375609777967184b8440441 Mon Sep 17 00:00:00 2001
From: Leyla Farazha <leyla@lindenlab.com>
Date: Mon, 6 Jun 2011 16:30:22 -0700
Subject: fixing drag and drop for inbox, adding inbox text and cleaning up
 context menus

---
 .../skins/default/xui/en/sidepanel_inventory.xml   | 25 ++++++++++++++++++----
 1 file changed, 21 insertions(+), 4 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/sidepanel_inventory.xml b/indra/newview/skins/default/xui/en/sidepanel_inventory.xml
index 49c45233d8..91de3047e6 100644
--- a/indra/newview/skins/default/xui/en/sidepanel_inventory.xml
+++ b/indra/newview/skins/default/xui/en/sidepanel_inventory.xml
@@ -9,7 +9,7 @@
 	  min_width="240"
 	  name="objects panel"
 	  width="333">
-	 <panel
+    <panel
 		 follows="all"
 		 layout="topleft"
 		 left="0"
@@ -66,6 +66,8 @@
                       label=""
                       height="125"
                       width="330">
+                     <string name="InboxLabelWithArg">MARKETPLACE INBOX ([NUM])</string>
+                     <string name="InboxLabelNoArg">MARKETPLACE INBOX</string>
                      <button
                          label="MARKETPLACE INBOX"
                          name="inbox_btn"
@@ -84,9 +86,24 @@
                              follows="all"
                              left="10"
                              height="90"
-                             width="330"
+                             width="308"
                              top="35"
+                             bg_opaque_color="InventoryBackgroundColor"
+  background_visible="true"
+  background_opaque="true"
                            >
+                             <text
+                                 type="string"
+		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>
                              <inventory_panel
                                 bg_opaque_color="DkGray2"
                                 bg_alpha_color="DkGray2"
@@ -95,14 +112,14 @@
                                 border="false"
                                 bevel_style="none"
                                 follows="all"
-                                height="90"
+                                height="70"
                                 start_folder="Inbox"
                                 layout="topleft"
                                 left="0"
                                 name="inventory_inbox"
                                 sort_order_setting="InventorySortOrder"
                                 show_item_link_overlays="true"
-                                top="0"
+                                top_pad="0"
                                 width="308" />   
                          </panel>
                  </panel>
-- 
cgit v1.2.3


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/default')

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


From cf31723a1a258e0452dd26d9f5eb5fcdac290e05 Mon Sep 17 00:00:00 2001
From: callum <none@none>
Date: Mon, 6 Jun 2011 17:12:17 -0700
Subject: EXP-844	INITIAL CHECKIN - FUNCTION DISABLED - As a first time
 user I would like to see a video after I log in that highlights the best
 features of Second Life

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

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

diff --git a/indra/newview/skins/default/xui/en/panel_progress.xml b/indra/newview/skins/default/xui/en/panel_progress.xml
index 2868d91cc7..4535c56339 100644
--- a/indra/newview/skins/default/xui/en/panel_progress.xml
+++ b/indra/newview/skins/default/xui/en/panel_progress.xml
@@ -132,4 +132,12 @@
      name="cancel_btn"
      top="700"
      width="90" />
+  <web_browser
+   follows="all"
+   layout="topleft"
+   left="0"
+   name="login_media_panel"
+   width="1024"
+   height="768"
+   top="0"/>
 </panel>
-- 
cgit v1.2.3


From 1aed9849285b574346087eb5ac7e0c8038fa21fe Mon Sep 17 00:00:00 2001
From: Leslie Linden <none@none>
Date: Tue, 7 Jun 2011 13:57:19 -0700
Subject: EXP-865 PROGRESS -- Modify LLBadge to allow it to hang off of
 non-buttons

Added the following for increased LLBadge functionality:
 * Panels now choose whether or not they accept buttons as children, which they
   do by default.
 * UI controls now shuffle controls with "requests_front" to the front of their
   children list at postBuild time.
 * Badges are set to "requests_front" by default
 * Badges now accept border image and color attributes

 Reviewed by Callum
---
 indra/newview/skins/default/colors.xml               | 2 +-
 indra/newview/skins/default/xui/en/widgets/badge.xml | 5 ++++-
 indra/newview/skins/default/xui/en/widgets/panel.xml | 3 ++-
 3 files changed, 7 insertions(+), 3 deletions(-)

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

diff --git a/indra/newview/skins/default/colors.xml b/indra/newview/skins/default/colors.xml
index a548849d60..efd2559a55 100644
--- a/indra/newview/skins/default/colors.xml
+++ b/indra/newview/skins/default/colors.xml
@@ -136,7 +136,7 @@
      name="BadgeImageColor"
      value="0.44 0.69 0.56 1.0" />
     <color
-     name="BadgeImageBorderColor"
+     name="BadgeBorderColor"
      value="0.9 0.9 0.9 1.0" />
     <color
      name="BadgeLabelColor"
diff --git a/indra/newview/skins/default/xui/en/widgets/badge.xml b/indra/newview/skins/default/xui/en/widgets/badge.xml
index ceec09d1e4..f77c4b7178 100644
--- a/indra/newview/skins/default/xui/en/widgets/badge.xml
+++ b/indra/newview/skins/default/xui/en/widgets/badge.xml
@@ -1,7 +1,9 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <!-- Additional attributes:
    -->
-<badge font="SansSerifSmall"
+<badge border_image="Badge_Border"
+       border_color="BadgeBorderColor"
+       font="SansSerifSmall"
        image="Badge_Background"
        image_color="BadgeImageColor"
        label_color="BadgeLabelColor"
@@ -10,5 +12,6 @@
        location_percent_vcenter="85"
        padding_horiz="7"
        padding_vert="4"
+       requests_front="true"
        >
 </badge>
diff --git a/indra/newview/skins/default/xui/en/widgets/panel.xml b/indra/newview/skins/default/xui/en/widgets/panel.xml
index 9bf99fa363..47a210d9b7 100644
--- a/indra/newview/skins/default/xui/en/widgets/panel.xml
+++ b/indra/newview/skins/default/xui/en/widgets/panel.xml
@@ -10,4 +10,5 @@
        bg_alpha_image_overlay="White"
        background_visible="false"
        background_opaque="false"
-       chrome="false"/>
\ No newline at end of file
+       chrome="false"
+       accepts_badge="true"/>
\ No newline at end of file
-- 
cgit v1.2.3


From 3eeb14ee0abb5720e010d94eba52db09fa32237e Mon Sep 17 00:00:00 2001
From: Leslie Linden <none@none>
Date: Fri, 10 Jun 2011 16:20:30 -0700
Subject: EXP-856 FIX -- Inbox item count reflected as badge on inventory
 button

* Modified badges to be parented to their owners if their owners have no parents
* Modified side tray tab panels to create badges on side tab buttons when the
  xml specifies a badge.
* Modified inbox to drive the badge value of the sidebar_inventory button.
* Updated inbox and outbox sizes so scroll bars function as expected
* Updated inventory_panel.xml to allow scroll tag to specify scroll bar
  properties, instead of just having them hardcoded.

Reviewed by Richard
---
 .../skins/default/xui/en/panel_side_tray.xml       |   1 +
 .../skins/default/xui/en/sidepanel_inventory.xml   | 125 +++++++++++----------
 .../default/xui/en/widgets/inventory_panel.xml     |   9 +-
 3 files changed, 74 insertions(+), 61 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/panel_side_tray.xml b/indra/newview/skins/default/xui/en/panel_side_tray.xml
index 6ef93406ec..0f330a7b98 100644
--- a/indra/newview/skins/default/xui/en/panel_side_tray.xml
+++ b/indra/newview/skins/default/xui/en/panel_side_tray.xml
@@ -142,6 +142,7 @@
     mouse_opaque="false"
     background_visible="true"
   >
+      <badge location="top_left" location_percent_vcenter="50" location_percent_hcenter="95" />
       <panel
         class="sidepanel_inventory"
         name="sidepanel_inventory"
diff --git a/indra/newview/skins/default/xui/en/sidepanel_inventory.xml b/indra/newview/skins/default/xui/en/sidepanel_inventory.xml
index c945f27ac6..373a9011a1 100644
--- a/indra/newview/skins/default/xui/en/sidepanel_inventory.xml
+++ b/indra/newview/skins/default/xui/en/sidepanel_inventory.xml
@@ -26,13 +26,13 @@
               top="0"
               orientation="vertical"
               name="inventory_layout_stack"
-             height="535"
+              height="535"
               width="330">
              <layout_panel
                  name="main_inventory_layout_panel"
                  min_dim="150"
                  width="330"
-                  follows="bottom|left|right"
+                 follows="bottom|left|right"
                  user_resize="false"
                  height="480">
                  <panel
@@ -50,12 +50,12 @@
              <layout_panel
                  width="330"
                  auto_resize="true"
-                user_resize="false"
-                  follows="bottom|left|right"
+                 user_resize="false"
+                 follows="bottom|left|right"
                  min_dim="35"
                  name="inbox_layout_panel"
                  max_dim="125"
-                 height="35">
+                 height="125">
                  <panel
                       follows="all"
                       layout="topleft"
@@ -69,59 +69,62 @@
                      <string name="InboxLabelWithArg">MARKETPLACE INBOX ([NUM])</string>
                      <string name="InboxLabelNoArg">MARKETPLACE INBOX</string>
                      <button
-                         label="MARKETPLACE INBOX"
-                         name="inbox_btn"
-                         height="35"
-                         width="308"
-                         image_unselected="MarketplaceBtn_Off"
-                            image_selected="MarketplaceBtn_Selected"
-                         halign="left"
-                         follows="top|left|right"
-                         is_toggle="true"
-                         tab_stop="false"
-                         pad_left="35"
-                         top="0"
+                        label="MARKETPLACE INBOX"
+                        name="inbox_btn"
+                        height="35"
+                        width="308"
+                        image_unselected="MarketplaceBtn_Off"
+                        image_selected="MarketplaceBtn_Selected"
+                        halign="left"
+                        follows="top|left|right"
+                        is_toggle="true"
+                        tab_stop="false"
+                        pad_left="35"
+                        top="0"
                         left="10" />
-                         <panel
-                             follows="all"
-                             left="10"
-                             height="90"
-                             width="308"
-                             top="35"
-                             bg_opaque_color="InventoryBackgroundColor"
-                             background_visible="true"
-                             background_opaque="true"
-                           >
-                             <text
-                                 type="string"
-                                 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>
-                             <inventory_panel
-                                bg_opaque_color="DkGray2"
-                                bg_alpha_color="DkGray2"
-                                background_visible="true"
-                                background_opaque="true"
-                                border="false"
-                                bevel_style="none"
-                                follows="all"
-                                height="70"
-                                start_folder="Inbox"
-                                layout="topleft"
-                                left="0"
-                                name="inventory_inbox"
-                                sort_order_setting="InventorySortOrder"
-                                show_item_link_overlays="true"
-                                top_pad="0"
-                                width="308" />   
-                         </panel>
+                     <panel
+                        follows="all"
+                        left="10"
+                        height="90"
+                        width="308"
+                        top="35"
+                        bg_opaque_color="InventoryBackgroundColor"
+                        background_visible="true"
+                        background_opaque="true"
+                    >
+                        <text
+                            type="string"
+                            length="1"
+                            follows="top|left|right"
+                            font="SansSerifSmall"
+                            use_ellipses="true"
+                            name="move_items_text"
+                            top="5"
+                            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"
+                            background_visible="true"
+                            background_opaque="true"
+                            border="false"
+                            bevel_style="none"
+                            follows="all"
+                            top="25"
+                            height="70"
+                            start_folder="Inbox"
+                            layout="topleft"
+                            left="0"
+                            name="inventory_inbox"
+                            sort_order_setting="InventorySortOrder"
+                            show_item_link_overlays="true"
+                            top_pad="0"
+                            width="308">
+                            <scroll reserve_scroll_corner="false" />
+                        </inventory_panel>
+                    </panel>
                  </panel>
              </layout_panel>
              <layout_panel
@@ -132,7 +135,7 @@
                 name="outbox_layout_panel"
                 min_dim="35"
                 max_dim="125"
-                height="35">
+                height="125">
                  <panel
                       follows="all"
                       layout="topleft"
@@ -200,7 +203,7 @@
                      <panel
                          follows="all"
                          left="0"
-                         height="90"
+                         bottom="125"
                          width="330"
                          top="35"
                            >
@@ -220,7 +223,9 @@
                               sort_order_setting="InventorySortOrder"
                               show_item_link_overlays="true"
                               top="0"
-                              width="308" />
+                              width="308">
+                             <scroll reserve_scroll_corner="false" />
+                         </inventory_panel>
                      </panel>
 
                  </panel>
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 93875d66e6..3164cc5eba 100644
--- a/indra/newview/skins/default/xui/en/widgets/inventory_panel.xml
+++ b/indra/newview/skins/default/xui/en/widgets/inventory_panel.xml
@@ -3,4 +3,11 @@
   bg_opaque_color="InventoryBackgroundColor"
   background_visible="true"
   background_opaque="true"
-  />
+  >
+    <scroll
+		name="Inventory Scroller"
+        follows="all"
+		reserve_scroll_corner="true"
+        tab_stop="true"
+        />
+</panel>
-- 
cgit v1.2.3


From 142c2fc29c9645df1bff924d6a61c09f04713a7b Mon Sep 17 00:00:00 2001
From: Leslie Linden <none@none>
Date: Tue, 14 Jun 2011 16:35:15 -0700
Subject: EXP-896 FIX -- Inbox not opened by default when new items are
 received EXP-894 FIX -- When scrolling to the bottom of the inbox, the last
 item is c... EXP-856 FIX -- Inbox item count reflected as badge on inventory
 button

* Inbox auto-expands when "fresh" items are reported
* Logic for "fresh" item determination is still in progress but works for purchases while logged in
* Badges now only displayed when the inventory side panel is collapsed or when inventory not visible

Reviewed by Leyla
---
 .../skins/default/xui/en/sidepanel_inventory.xml   | 61 ++++++++++++----------
 1 file changed, 33 insertions(+), 28 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/sidepanel_inventory.xml b/indra/newview/skins/default/xui/en/sidepanel_inventory.xml
index 373a9011a1..9a91f90f79 100644
--- a/indra/newview/skins/default/xui/en/sidepanel_inventory.xml
+++ b/indra/newview/skins/default/xui/en/sidepanel_inventory.xml
@@ -54,8 +54,8 @@
                  follows="bottom|left|right"
                  min_dim="35"
                  name="inbox_layout_panel"
-                 max_dim="125"
-                 height="125">
+                 max_dim="200"
+                 height="200">
                  <panel
                       follows="all"
                       layout="topleft"
@@ -64,12 +64,12 @@
                       class="panel_marketplace_inbox"
                       top="0"
                       label=""
-                      height="125"
+                      height="200"
                       width="330">
-                     <string name="InboxLabelWithArg">MARKETPLACE INBOX ([NUM])</string>
-                     <string name="InboxLabelNoArg">MARKETPLACE INBOX</string>
+                     <string name="InboxLabelWithArg">Received Items ([NUM])</string>
+                     <string name="InboxLabelNoArg">Received Items</string>
                      <button
-                        label="MARKETPLACE INBOX"
+                        label="Received Items"
                         name="inbox_btn"
                         height="35"
                         width="308"
@@ -82,28 +82,33 @@
                         pad_left="35"
                         top="0"
                         left="10" />
+                     <text
+                        type="string"
+                        length="1"
+                        follows="right|top"
+                        layout="topleft"
+                        height="13"
+                        top="10"
+                        right="-20"
+                        name="inbox_fresh_new_count"
+                        font="SansSerifMedium"
+                        halign="right"
+                        text_color="EmphasisColor"
+                        top_pad="0"
+                        width="300">
+                        [NUM] New
+                     </text>
                      <panel
                         follows="all"
                         left="10"
-                        height="90"
+                        bottom="200"
                         width="308"
                         top="35"
                         bg_opaque_color="InventoryBackgroundColor"
                         background_visible="true"
                         background_opaque="true"
-                    >
-                        <text
-                            type="string"
-                            length="1"
-                            follows="top|left|right"
-                            font="SansSerifSmall"
-                            use_ellipses="true"
-                            name="move_items_text"
-                            top="5"
-                            left="4"
-                            height="20"
-                            width="304"
-                            >Move items to your inventory to manage and use them.</text>
+                        tool_tip="Drag and drop items to your inventory to manage and use them"
+                        >
                         <inventory_panel
                             bg_opaque_color="DkGray2"
                             bg_alpha_color="DkGray2"
@@ -112,8 +117,8 @@
                             border="false"
                             bevel_style="none"
                             follows="all"
-                            top="25"
-                            height="70"
+                            top="0"
+                            height="165"
                             start_folder="Inbox"
                             layout="topleft"
                             left="0"
@@ -134,8 +139,8 @@
                 follows="bottom|left|right"
                 name="outbox_layout_panel"
                 min_dim="35"
-                max_dim="125"
-                height="125">
+                max_dim="200"
+                height="200">
                  <panel
                       follows="all"
                       layout="topleft"
@@ -144,10 +149,10 @@
                       class="panel_marketplace_outbox"
                       top="0"
                       label=""
-                      height="125"
+                      height="200"
                       width="310">
                      <button
-                        label="MARKETPLACE OUTBOX"
+                        label="Merchant Outbox"
                         is_toggle="true"
                         name="outbox_btn"
                         follows="top|left|right"
@@ -203,7 +208,7 @@
                      <panel
                          follows="all"
                          left="0"
-                         bottom="125"
+                         bottom="200"
                          width="330"
                          top="35"
                            >
@@ -215,7 +220,7 @@
                               border="false"
                               bevel_style="none"
                               follows="all"
-                              height="90"
+                              height="165"
                               start_folder="Outbox"
                               layout="topleft"
                               left="0"
-- 
cgit v1.2.3


From 64f978dc81cf6b3dad42fc5f1cf3896208efc8ac Mon Sep 17 00:00:00 2001
From: Leyla Farazha <leyla@lindenlab.com>
Date: Thu, 16 Jun 2011 16:39:30 -0700
Subject: EXP-891 Right click on Inbox or Outbox toggles up down arrow but has
 no action

---
 indra/newview/skins/default/xui/en/sidepanel_inventory.xml | 2 ++
 indra/newview/skins/default/xui/en/widgets/button.xml      | 1 +
 2 files changed, 3 insertions(+)

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

diff --git a/indra/newview/skins/default/xui/en/sidepanel_inventory.xml b/indra/newview/skins/default/xui/en/sidepanel_inventory.xml
index 9a91f90f79..1fedd6aab8 100644
--- a/indra/newview/skins/default/xui/en/sidepanel_inventory.xml
+++ b/indra/newview/skins/default/xui/en/sidepanel_inventory.xml
@@ -76,6 +76,7 @@
                         image_unselected="MarketplaceBtn_Off"
                         image_selected="MarketplaceBtn_Selected"
                         halign="left"
+                        handle_right_mouse="false"
                         follows="top|left|right"
                         is_toggle="true"
                         tab_stop="false"
@@ -154,6 +155,7 @@
                      <button
                         label="Merchant Outbox"
                         is_toggle="true"
+                        handle_right_mouse="false"
                         name="outbox_btn"
                         follows="top|left|right"
                         image_unselected="MarketplaceBtn_Off"
diff --git a/indra/newview/skins/default/xui/en/widgets/button.xml b/indra/newview/skins/default/xui/en/widgets/button.xml
index 16241ed84e..302014eb24 100644
--- a/indra/newview/skins/default/xui/en/widgets/button.xml
+++ b/indra/newview/skins/default/xui/en/widgets/button.xml
@@ -25,5 +25,6 @@
         pad_bottom="3" 
         height="23"
         scale_image="true"
+        handle_right_mouse="true"
         use_draw_context_alpha="true">
 </button>
-- 
cgit v1.2.3


From 5af57330eb23dd6f00f02bafdf08ee70b5cae50b Mon Sep 17 00:00:00 2001
From: Leslie Linden <leslie@lindenlab.com>
Date: Mon, 20 Jun 2011 08:57:57 -0700
Subject: EXP-917 FIX -- Inbox and Outbox options shown in the + Menu in the
 Inventory Panel

Oops.
---
 .../newview/skins/default/xui/en/menu_inventory_add.xml  | 16 ----------------
 1 file changed, 16 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/menu_inventory_add.xml b/indra/newview/skins/default/xui/en/menu_inventory_add.xml
index f38ea04858..e0ccb18c08 100644
--- a/indra/newview/skins/default/xui/en/menu_inventory_add.xml
+++ b/indra/newview/skins/default/xui/en/menu_inventory_add.xml
@@ -91,22 +91,6 @@
                  function="Inventory.DoCreate"
                  parameter="category" />
             </menu_item_call>
-            <menu_item_call
-                    label="Inbox"
-                   layout="topleft"
-                    name="Inbox">
-               <menu_item_call.on_click
-     function="Inventory.DoCreate"
-     parameter="inbox" />
-</menu_item_call>
-           <menu_item_call
-                 label="Outbox"
-                 layout="topleft"
-                 name="Outbox">
-             <menu_item_call.on_click
-     function="Inventory.DoCreate"
-     parameter="outbox" />
-</menu_item_call>
             <menu_item_call
              label="New Script"
              layout="topleft"
-- 
cgit v1.2.3


From 4267014b146798cabe96568b2091c6bb2dd2b294 Mon Sep 17 00:00:00 2001
From: Leslie Linden <leslie@lindenlab.com>
Date: Wed, 22 Jun 2011 17:35:25 -0400
Subject: EXP-890 FIX -- Resizing inbox or outbox to minimum size while open
 does not show present items when hte box is next opened EXP-897 FIX -- Black
 box shown in UI when shrinking Inbox down in size

* Layout panel now supports "expanded_min_dim" parameter which allows a different min
  size to be specified when the layout panel is collapsed vs expanded.
* Inbox and Outbox expanded_min_dim attributes are now set to be larger than min dim
  so they can not be collapsed all the way when they are expanded.
---
 indra/newview/skins/default/xui/en/sidepanel_inventory.xml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

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

diff --git a/indra/newview/skins/default/xui/en/sidepanel_inventory.xml b/indra/newview/skins/default/xui/en/sidepanel_inventory.xml
index 1fedd6aab8..00f3135035 100644
--- a/indra/newview/skins/default/xui/en/sidepanel_inventory.xml
+++ b/indra/newview/skins/default/xui/en/sidepanel_inventory.xml
@@ -52,9 +52,10 @@
                  auto_resize="true"
                  user_resize="false"
                  follows="bottom|left|right"
-                 min_dim="35"
                  name="inbox_layout_panel"
+                 min_dim="35"
                  max_dim="200"
+				 expanded_min_dim="90"
                  height="200">
                  <panel
                       follows="all"
@@ -141,6 +142,7 @@
                 name="outbox_layout_panel"
                 min_dim="35"
                 max_dim="200"
+				expanded_min_dim="90"
                 height="200">
                  <panel
                       follows="all"
-- 
cgit v1.2.3


From e74f9fcc147edd24576a25bb6a0af69ac8d6a600 Mon Sep 17 00:00:00 2001
From: Leslie Linden <leslie@lindenlab.com>
Date: Thu, 23 Jun 2011 18:11:55 -0400
Subject: EXP-919 FIX -- Toggling InventoryDisplayInbox value to True in Viewer
 on Agni creates Inbox and Outbox system folders

* The badge no longer displays (2) when the folder does not exist.
* The inbox panel no longer displays the inventory and library folders.
* The inbox is supposed to display a string for the item not being found, but doesn't for an unknown reason.
---
 indra/newview/skins/default/xui/en/sidepanel_inventory.xml | 1 +
 1 file changed, 1 insertion(+)

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

diff --git a/indra/newview/skins/default/xui/en/sidepanel_inventory.xml b/indra/newview/skins/default/xui/en/sidepanel_inventory.xml
index 00f3135035..778daac83b 100644
--- a/indra/newview/skins/default/xui/en/sidepanel_inventory.xml
+++ b/indra/newview/skins/default/xui/en/sidepanel_inventory.xml
@@ -69,6 +69,7 @@
                       width="330">
                      <string name="InboxLabelWithArg">Received Items ([NUM])</string>
                      <string name="InboxLabelNoArg">Received Items</string>
+					 <string name="InboxNoItems">Items purchased through the marketplace will be delivered here.</string>
                      <button
                         label="Received Items"
                         name="inbox_btn"
-- 
cgit v1.2.3


From 6c12a5ca550e06730e06d1a909fbf43d7bda16f5 Mon Sep 17 00:00:00 2001
From: Leslie Linden <leslie@lindenlab.com>
Date: Thu, 30 Jun 2011 16:25:19 -0700
Subject: EXP-919 FIX -- Items not shown in Received Items panel EXP-929 FIX --
 First Direct Delivery item purchased while logged in: Received Items folder
 visible in inventory and item not visible in Received items panel - no badge
 count update

* Inbox and Outbox inventory panels now live in their own XML files and are hot loaded into place when appropriate, like when the "Received Items" folder is first created, for example.
* The Inbox and Outbox panels now show relevant default messages when the folders are empty or do not exist
* Added LLInventoryCategoryAddedObserver, a new inventory observer type to observe added folders
* Hacked LLInventoryPanel to properly set up inbox and outbox inventory views for the "Received Items" folder and the "Merchant Outbox" folder that aren't created with the proper system folder type
* Changed inventory badge count computation to use LLFolderView rather than the inventory directly
* Applied various focus, selection and other inbox fixes to the outbox

Reviewed by Richard.
---
 .../skins/default/xui/en/panel_inbox_inventory.xml | 17 +++++
 .../default/xui/en/panel_outbox_inventory.xml      | 17 +++++
 .../skins/default/xui/en/sidepanel_inventory.xml   | 85 ++++++++++------------
 indra/newview/skins/default/xui/en/strings.xml     |  2 +
 4 files changed, 73 insertions(+), 48 deletions(-)
 create mode 100644 indra/newview/skins/default/xui/en/panel_inbox_inventory.xml
 create mode 100644 indra/newview/skins/default/xui/en/panel_outbox_inventory.xml

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

diff --git a/indra/newview/skins/default/xui/en/panel_inbox_inventory.xml b/indra/newview/skins/default/xui/en/panel_inbox_inventory.xml
new file mode 100644
index 0000000000..49abbcde71
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/panel_inbox_inventory.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<inventory_panel
+    name="inventory_inbox"
+    start_folder="Inbox"
+    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"
+    background_opaque="true"
+    border="false"
+    bevel_style="none"
+    show_item_link_overlays="true"
+    >
+    <scroll reserve_scroll_corner="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
new file mode 100644
index 0000000000..af32056428
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/panel_outbox_inventory.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<inventory_panel
+    name="inventory_outbox"
+    start_folder="Outbox"
+    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"
+    background_opaque="true"
+    border="false"
+    bevel_style="none"
+    show_item_link_overlays="true"
+    >
+    <scroll reserve_scroll_corner="false" />
+</inventory_panel>
diff --git a/indra/newview/skins/default/xui/en/sidepanel_inventory.xml b/indra/newview/skins/default/xui/en/sidepanel_inventory.xml
index 778daac83b..baf37ae0b4 100644
--- a/indra/newview/skins/default/xui/en/sidepanel_inventory.xml
+++ b/indra/newview/skins/default/xui/en/sidepanel_inventory.xml
@@ -69,7 +69,6 @@
                       width="330">
                      <string name="InboxLabelWithArg">Received Items ([NUM])</string>
                      <string name="InboxLabelNoArg">Received Items</string>
-					 <string name="InboxNoItems">Items purchased through the marketplace will be delivered here.</string>
                      <button
                         label="Received Items"
                         name="inbox_btn"
@@ -112,26 +111,19 @@
                         background_opaque="true"
                         tool_tip="Drag and drop items to your inventory to manage and use them"
                         >
-                        <inventory_panel
-                            bg_opaque_color="DkGray2"
-                            bg_alpha_color="DkGray2"
-                            background_visible="true"
-                            background_opaque="true"
-                            border="false"
-                            bevel_style="none"
-                            follows="all"
-                            top="0"
-                            height="165"
-                            start_folder="Inbox"
-                            layout="topleft"
-                            left="0"
-                            name="inventory_inbox"
-                            sort_order_setting="InventorySortOrder"
-                            show_item_link_overlays="true"
-                            top_pad="0"
-                            width="308">
-                            <scroll reserve_scroll_corner="false" />
-                        </inventory_panel>
+                        <text
+							name="inbox_inventory_placeholder"
+							type="string"
+							follows="all"
+							layout="topleft"
+							top="0"
+							left="0"
+							width="308"
+							height="165"
+							wrap="true"
+							halign="center">
+							Purchases from the marketplace will be delivered here.
+						</text>
                     </panel>
                  </panel>
              </layout_panel>
@@ -211,33 +203,30 @@
                          </images>
                      </loading_indicator>
                      <panel
-                         follows="all"
-                         left="0"
-                         bottom="200"
-                         width="330"
-                         top="35"
-                           >
-                         <inventory_panel
-                              bg_opaque_color="DkGray2"
-                              bg_alpha_color="DkGray2"
-                              background_visible="true"
-                              background_opaque="true"
-                              border="false"
-                              bevel_style="none"
-                              follows="all"
-                              height="165"
-                              start_folder="Outbox"
-                              layout="topleft"
-                              left="0"
-                              name="inventory_outbox"
-                              sort_order_setting="InventorySortOrder"
-                              show_item_link_overlays="true"
-                              top="0"
-                              width="308">
-                             <scroll reserve_scroll_corner="false" />
-                         </inventory_panel>
-                     </panel>
-
+                        follows="all"
+                        left="10"
+                        bottom="200"
+                        width="308"
+                        top="35"
+                        bg_opaque_color="InventoryBackgroundColor"
+                        background_visible="true"
+                        background_opaque="true"
+                        tool_tip="Drag and drop items here to prepare them for sale on your storefront"
+                        >
+                        <text
+							name="outbox_inventory_placeholder"
+							type="string"
+							follows="all"
+							layout="topleft"
+							top="0"
+							left="0"
+							width="308"
+							height="165"
+							wrap="true"
+							halign="center">
+							Set up your merchant account to use this feature.
+						</text>
+                    </panel>
                  </panel>
              </layout_panel>
          </layout_stack>
diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index 71f48c833d..2fa7b9f796 100644
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -2021,6 +2021,8 @@ Returns a string with the requested data about the region
 	<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="InventoryNoTexture">You do not have a copy of this texture in your inventory</string>
+	<string name="InventoryInboxNoItems">Items purchased through the marketplace will be delivered here.</string>
+	<string name="InventoryOutboxNoItems">Drag items here in preparation for listing on your marketplace storefront.</string>
     <!-- use value="" because they have preceding spaces -->
 	<string name="no_transfer" value=" (no transfer)" />
 	<string name="no_modify"   value=" (no modify)" />
-- 
cgit v1.2.3


From d9d858a7520a7f3627afbe49a19217264f8c4928 Mon Sep 17 00:00:00 2001
From: Leslie Linden <leslie@lindenlab.com>
Date: Tue, 5 Jul 2011 11:19:54 -0700
Subject: EXP-973 FIX -- Inbox and Outbox panel flash on and off when open
 inventory panel for first time in session on Agni in direct delivery viewer

Layout panels that contain the inbox and outbox are now invisible by default.

Reviewed by Richard.
---
 indra/newview/skins/default/xui/en/sidepanel_inventory.xml | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/sidepanel_inventory.xml b/indra/newview/skins/default/xui/en/sidepanel_inventory.xml
index baf37ae0b4..79a0ec7c72 100644
--- a/indra/newview/skins/default/xui/en/sidepanel_inventory.xml
+++ b/indra/newview/skins/default/xui/en/sidepanel_inventory.xml
@@ -53,9 +53,10 @@
                  user_resize="false"
                  follows="bottom|left|right"
                  name="inbox_layout_panel"
+                 visible="false"
                  min_dim="35"
                  max_dim="200"
-				 expanded_min_dim="90"
+                 expanded_min_dim="90"
                  height="200">
                  <panel
                       follows="all"
@@ -133,9 +134,10 @@
                 user_resize="false"
                 follows="bottom|left|right"
                 name="outbox_layout_panel"
+                visible="false"
                 min_dim="35"
                 max_dim="200"
-				expanded_min_dim="90"
+                expanded_min_dim="90"
                 height="200">
                  <panel
                       follows="all"
-- 
cgit v1.2.3


From 2f21ec48a222662351c9f8e7243673eb6a31b457 Mon Sep 17 00:00:00 2001
From: Leslie Linden <leslie@lindenlab.com>
Date: Tue, 5 Jul 2011 12:32:12 -0700
Subject: EXP-860 FIX -- Display NEW for items added to inbox

* Added createFolderView, createFolderViewFolder and createFolderViewItem virtuals
  to LLInventoryPanel so these can be overridden by a derived class for custom display.
* Added new LLInboxInventoryPanel class that overrides createFolderViewFolder with a
  LLInboxFolderViewFolder for custom display with NEW tags.
* LLInboxFolderViewFolder NEW tag is tied to the mFresh variable that currently has
  no logic attached to it, meaning it remains off all the time.

Reviewed by Richard.
---
 indra/newview/skins/default/xui/en/panel_inbox_inventory.xml   |  6 +++---
 .../skins/default/xui/en/widgets/inbox_folder_view_folder.xml  | 10 ++++++++++
 2 files changed, 13 insertions(+), 3 deletions(-)
 create mode 100644 indra/newview/skins/default/xui/en/widgets/inbox_folder_view_folder.xml

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

diff --git a/indra/newview/skins/default/xui/en/panel_inbox_inventory.xml b/indra/newview/skins/default/xui/en/panel_inbox_inventory.xml
index 49abbcde71..d06190ec54 100644
--- a/indra/newview/skins/default/xui/en/panel_inbox_inventory.xml
+++ b/indra/newview/skins/default/xui/en/panel_inbox_inventory.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<inventory_panel
+<inbox_inventory_panel
     name="inventory_inbox"
-    start_folder="Inbox"
+    start_folder="Received Items"
     follows="all" layout="topleft"
     top="0" left="0" height="165" width="308"
 	top_pad="0"
@@ -14,4 +14,4 @@
     show_item_link_overlays="true"
     >
     <scroll reserve_scroll_corner="false" />
-</inventory_panel>
+</inbox_inventory_panel>
diff --git a/indra/newview/skins/default/xui/en/widgets/inbox_folder_view_folder.xml b/indra/newview/skins/default/xui/en/widgets/inbox_folder_view_folder.xml
new file mode 100644
index 0000000000..2c987b158d
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/widgets/inbox_folder_view_folder.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<inbox_folder_view_folder
+  folder_arrow_image="Folder_Arrow"
+  folder_indentation="8"
+  item_height="20" 
+  item_top_pad="4"
+  selection_image="Rounded_Square"
+  >
+	<new_badge label="New" location="right" location_percent_hcenter="70" />
+</inbox_folder_view_folder>
-- 
cgit v1.2.3


From 72c7525e677b8e5391abf5b552aa8d068f0e82d6 Mon Sep 17 00:00:00 2001
From: Leslie Linden <leslie@lindenlab.com>
Date: Tue, 5 Jul 2011 16:07:09 -0700
Subject: EXP-916 FIX -- Folder in Inbox indicates loading when all items are
 displayed in folder

* Updated inbox inventory to not ever display the loading status like other inventory windows.
* show_load_status is now an optional parameter for LLInventoryPanel and LLFolderView.  Its
  default value is true but it is overridden to be false for the LLInboxInventoryPanel.

Reviewed by Richard.
---
 indra/newview/skins/default/xui/en/widgets/inbox_inventory_panel.xml | 2 ++
 indra/newview/skins/default/xui/en/widgets/inventory_panel.xml       | 1 +
 2 files changed, 3 insertions(+)
 create mode 100644 indra/newview/skins/default/xui/en/widgets/inbox_inventory_panel.xml

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

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
new file mode 100644
index 0000000000..830c27bdac
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/widgets/inbox_inventory_panel.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<inbox_inventory_panel show_load_status="false" />
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 3164cc5eba..00f4c43915 100644
--- a/indra/newview/skins/default/xui/en/widgets/inventory_panel.xml
+++ b/indra/newview/skins/default/xui/en/widgets/inventory_panel.xml
@@ -3,6 +3,7 @@
   bg_opaque_color="InventoryBackgroundColor"
   background_visible="true"
   background_opaque="true"
+  show_load_status="true"
   >
     <scroll
 		name="Inventory Scroller"
-- 
cgit v1.2.3


From aecfaef10c41dce7395c3a02dcd84a39b6ffbeee Mon Sep 17 00:00:00 2001
From: Richard Linden <none@none>
Date: Tue, 5 Jul 2011 16:51:04 -0700
Subject: EXP-982 FIX As a user, I would like to see the new web-based profiles
 without any browser chrome and at an appropriate default size

---
 indra/newview/skins/default/xui/en/floater_media_browser.xml | 2 +-
 indra/newview/skins/default/xui/en/floater_web_content.xml   | 9 +++++++--
 2 files changed, 8 insertions(+), 3 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/floater_media_browser.xml b/indra/newview/skins/default/xui/en/floater_media_browser.xml
index 43729d7c9f..5a1f920398 100644
--- a/indra/newview/skins/default/xui/en/floater_media_browser.xml
+++ b/indra/newview/skins/default/xui/en/floater_media_browser.xml
@@ -5,7 +5,7 @@
  height="440"
  layout="topleft"
  min_height="140"
- min_width="467"
+ min_width="0"
  name="floater_about"
  help_topic="floater_about"
  save_rect="true"
diff --git a/indra/newview/skins/default/xui/en/floater_web_content.xml b/indra/newview/skins/default/xui/en/floater_web_content.xml
index e04a72cbc0..a62ff21589 100644
--- a/indra/newview/skins/default/xui/en/floater_web_content.xml
+++ b/indra/newview/skins/default/xui/en/floater_web_content.xml
@@ -18,6 +18,7 @@
     follows="left|right|top|bottom"
     layout="topleft"
     left="5"
+    animate="false"
     name="stack1"
     orientation="vertical"
     top="20"
@@ -156,14 +157,18 @@
       name="external_controls"
       top_delta="0"
       user_resize="false"
+      auto_resize="true"
       width="585">
       <web_browser
-        bottom="-22"
+        bottom="-2"
         follows="all"
         layout="topleft"
         left="0"
         name="webbrowser"
         top="0"/>
+    </layout_panel>
+    <layout_panel name="status_bar" 
+                  height="23">
       <text
         type="string"
         length="200"
@@ -174,7 +179,7 @@
         name="statusbartext"
         parse_urls="false"
         text_color="0.4 0.4 0.4 1"
-        top_pad="5"
+        top_pad="3"
         width="495"/>
       <progress_bar
         color_bar="0.3 1.0 0.3 1"
-- 
cgit v1.2.3


From caff254c9155b55412556c9270bec4b114d83270 Mon Sep 17 00:00:00 2001
From: Richard Linden <none@none>
Date: Wed, 6 Jul 2011 18:43:52 -0700
Subject: EXP-847 FIX As a user, I would like to see the How To floater appear
 the first time I log in to basic mode

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

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

diff --git a/indra/newview/skins/default/xui/en/floater_help_browser.xml b/indra/newview/skins/default/xui/en/floater_help_browser.xml
index 02e50ee584..de6d586f72 100644
--- a/indra/newview/skins/default/xui/en/floater_help_browser.xml
+++ b/indra/newview/skins/default/xui/en/floater_help_browser.xml
@@ -2,6 +2,8 @@
 <floater
  legacy_header_height="18"
  can_resize="true"
+ left="10000"
+ bottom="10000"
  height="600"
  layout="topleft"
  min_height="150"
-- 
cgit v1.2.3


From 4ec383808b7f45072875c8315a245b13941272ee Mon Sep 17 00:00:00 2001
From: Richard Linden <none@none>
Date: Wed, 6 Jul 2011 19:04:08 -0700
Subject: EXP-982 FIX As a user, I wuold like to see the new web-based profiles
 without any browser chrome fixed status bar resizing to take up too much
 space

---
 indra/newview/skins/default/xui/en/floater_web_content.xml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

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

diff --git a/indra/newview/skins/default/xui/en/floater_web_content.xml b/indra/newview/skins/default/xui/en/floater_web_content.xml
index a62ff21589..69e6057556 100644
--- a/indra/newview/skins/default/xui/en/floater_web_content.xml
+++ b/indra/newview/skins/default/xui/en/floater_web_content.xml
@@ -168,7 +168,9 @@
         top="0"/>
     </layout_panel>
     <layout_panel name="status_bar" 
-                  height="23">
+                  height="23"
+                  auto_resize="false"
+                  user_resize="false">
       <text
         type="string"
         length="200"
-- 
cgit v1.2.3