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

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

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

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

---
 .../skins/default/xui/en/sidepanel_inventory.xml   | 139 ++++++++++++---------
 1 file changed, 83 insertions(+), 56 deletions(-)

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

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/xui/en/widgets/badge.xml | 14 ++++++++++++++
 1 file changed, 14 insertions(+)
 create mode 100644 indra/newview/skins/default/xui/en/widgets/badge.xml

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

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

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

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

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

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

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

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
---
 .../skins/default/xui/en/sidepanel_inventory.xml   | 69 ++++++++++++++--------
 .../newview/skins/default/xui/en/widgets/badge.xml |  2 +-
 2 files changed, 47 insertions(+), 24 deletions(-)

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

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

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

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.
---
 .../skins/default/xui/en/sidepanel_inventory.xml   | 117 +++++++++++----------
 1 file changed, 61 insertions(+), 56 deletions(-)

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

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

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/xui/en/widgets/badge.xml | 5 ++++-
 indra/newview/skins/default/xui/en/widgets/panel.xml | 3 ++-
 2 files changed, 6 insertions(+), 2 deletions(-)

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

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

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

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

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

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

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