From edcf44ad5905b633acf07bd00437ceeaf8fe8d1b Mon Sep 17 00:00:00 2001
From: Vladimir Pchelko <pchelko@productengine.com>
Date: Fri, 2 Jul 2010 14:56:24 +0300
Subject: EXT-7473 FIXED ("Share" button was added to "gear" menu in Inventory
 SP.)

Reviewed by Vadim Savchuk at https://codereview.productengine.com/secondlife/r/678/

--HG--
branch : product-engine
---
 .../skins/default/xui/en/menu_inventory_gear_default.xml      | 11 +++++++++++
 1 file changed, 11 insertions(+)

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

diff --git a/indra/newview/skins/default/xui/en/menu_inventory_gear_default.xml b/indra/newview/skins/default/xui/en/menu_inventory_gear_default.xml
index 62365f7cc2..c394700081 100644
--- a/indra/newview/skins/default/xui/en/menu_inventory_gear_default.xml
+++ b/indra/newview/skins/default/xui/en/menu_inventory_gear_default.xml
@@ -81,6 +81,17 @@
 			 function="Inventory.GearDefault.Enable"
 			 parameter="save_texture" />
         </menu_item_call>
+    <menu_item_call
+     label="Share"
+     layout="topleft"
+     name="Share"
+     visible="true">
+     <on_click
+         function="Inventory.Share" />
+     <on_enable
+         function="Inventory.GearDefault.Enable"
+         parameter="share" />
+    </menu_item_call>
     <menu_item_call 
          label="Find Original"
          layout="topleft"
-- 
cgit v1.2.3


From 9388a14e47c61cb5745494982b588a93e4f9d811 Mon Sep 17 00:00:00 2001
From: Vladimir Pchelko <pchelko@productengine.com>
Date: Fri, 2 Jul 2010 15:07:33 +0300
Subject: EXT-8136 FIXED (Accordion order in outfit editor was corrected.
 (Attachment / Clothing / Body). -> (Clothing / Attachment / Body).)

Reviewed by Vadim Savchuk and Neal Orman https://codereview.productengine.com/secondlife/r/671/

--HG--
branch : product-engine
---
 .../skins/default/xui/en/panel_cof_wearables.xml   | 26 +++++++++++-----------
 1 file changed, 13 insertions(+), 13 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/panel_cof_wearables.xml b/indra/newview/skins/default/xui/en/panel_cof_wearables.xml
index d5943ea156..f438e3d42d 100644
--- a/indra/newview/skins/default/xui/en/panel_cof_wearables.xml
+++ b/indra/newview/skins/default/xui/en/panel_cof_wearables.xml
@@ -22,40 +22,40 @@
      width="311">
         <accordion_tab
          layout="topleft"
-         name="tab_attachments"
-         title="Attachments">
+         name="tab_clothing"
+         title="Clothing">
             <flat_list_view
              allow_select="true"
              follows="all"
              height="10"
              item_pad="3"
+             keep_selection_visible_on_reshape="true"
              layout="topleft"
              left="0"
-             keep_selection_visible_on_reshape="true"
              multi_select="true"
-             name="list_attachments"
+             name="list_clothing"
              top="0"
-             width="311">
-              <flat_list_view.no_items_text
-               value="No attachments worn" />
-              </flat_list_view>
+             width="311" />
         </accordion_tab>
         <accordion_tab
          layout="topleft"
-         name="tab_clothing"
-         title="Clothing">
+         name="tab_attachments"
+         title="Attachments">
             <flat_list_view
              allow_select="true"
              follows="all"
              height="10"
              item_pad="3"
-             keep_selection_visible_on_reshape="true"
              layout="topleft"
              left="0"
+             keep_selection_visible_on_reshape="true"
              multi_select="true"
-             name="list_clothing"
+             name="list_attachments"
              top="0"
-             width="311" />
+             width="311">
+              <flat_list_view.no_items_text
+               value="No attachments worn" />
+              </flat_list_view>
         </accordion_tab>
         <accordion_tab
          layout="topleft"
-- 
cgit v1.2.3


From daec4f6bb75634c6355f58d9fa5ef60f50a2e73f Mon Sep 17 00:00:00 2001
From: Andrew Dyukov <adyukov@productengine.com>
Date: Fri, 2 Jul 2010 21:43:33 +0300
Subject: EXT-3919 FIXED Added resize corner button to the right bottom corner
 of the SL window.

- Added resize corner icon into main_view.xml to the bottom right of the popup view. Added small dummy icon to the right part of bottom tray to avoid well buttons overlapping it.

Reviewed by Vadim Savchuk at https://codereview.productengine.com/secondlife/r/690/

--HG--
branch : product-engine
---
 indra/newview/skins/default/xui/en/main_view.xml        | 10 +++++++++-
 indra/newview/skins/default/xui/en/panel_bottomtray.xml | 12 ++++++++++++
 2 files changed, 21 insertions(+), 1 deletion(-)

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

diff --git a/indra/newview/skins/default/xui/en/main_view.xml b/indra/newview/skins/default/xui/en/main_view.xml
index 72ab6195bc..a1ca910cbb 100644
--- a/indra/newview/skins/default/xui/en/main_view.xml
+++ b/indra/newview/skins/default/xui/en/main_view.xml
@@ -199,7 +199,15 @@
          mouse_opaque="false"
          name="popup_holder"
          class="popup_holder"
-         width="1024"/>
+         width="1024">
+    <icon follows="right|bottom"
+          image_name="Resize_Corner"
+          right="-1"
+          name="resize_corner"
+          width="11"
+          bottom="-1"
+          height="11" />
+  </panel>
   <menu_holder top="0"
                follows="all"
                height="768"
diff --git a/indra/newview/skins/default/xui/en/panel_bottomtray.xml b/indra/newview/skins/default/xui/en/panel_bottomtray.xml
index 4eff5bc48a..4b622691b3 100644
--- a/indra/newview/skins/default/xui/en/panel_bottomtray.xml
+++ b/indra/newview/skins/default/xui/en/panel_bottomtray.xml
@@ -503,5 +503,17 @@ image_pressed_selected  "Lit" + "Selected" - there are new messages and the Well
                 </button>
             </chiclet_notification>
         </layout_panel>
+      <icon
+         auto_resize="false"
+         color="0 0 0 0"
+         follows="left|right"
+         height="10"
+         image_name="spacer24.tga"
+         layout="topleft"
+         left="0"
+         min_width="4"
+         name="DUMMY2"
+         top="0"
+         width="8" />
     </layout_stack>
 </panel>
-- 
cgit v1.2.3


From ae8d5132850783cab152d8b0cc3a431e249d6844 Mon Sep 17 00:00:00 2001
From: Loren Shih <seraph@lindenlab.com>
Date: Fri, 2 Jul 2010 16:11:06 -0400
Subject: EXT-6701 FIXED Script Floater shows "MissingString..." when object is
 attached to invalid attachment index

Added string entry.
---
 indra/newview/skins/default/xui/en/strings.xml | 1 +
 1 file changed, 1 insertion(+)

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

diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index f7611b6833..1e8d0d2fe5 100644
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -2159,6 +2159,7 @@ Clears (deletes) the media and all params from the given face.
 	<string name="ATTACH_HUD_BOTTOM_LEFT">HUD Bottom Left</string>
 	<string name="ATTACH_HUD_BOTTOM">HUD Bottom</string>
 	<string name="ATTACH_HUD_BOTTOM_RIGHT">HUD Bottom Right</string>
+	<string name="Bad attachment point">Invalid Attachment Point</string>
 			
 	<!-- script editor -->
 	<string name="CursorPos">Line [LINE], Column [COLUMN]</string>
-- 
cgit v1.2.3


From 1be44136e08d632fcf0ebcfd88484793437bd551 Mon Sep 17 00:00:00 2001
From: Andrew Dyukov <adyukov@productengine.com>
Date: Mon, 5 Jul 2010 20:18:52 +0300
Subject: EXT-8146 FIXED Added confirmation dialog before outfit(s) deleting.

- Added new notification which appears when trash button in "My Outfits" is clicked. Used it in code to only delete outfits if OK is selected.

Reviewed by Vadim Savchuk at https://codereview.productengine.com/secondlife/r/695/

--HG--
branch : product-engine
---
 indra/newview/skins/default/xui/en/notifications.xml | 11 +++++++++++
 1 file changed, 11 insertions(+)

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

diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index 290c8c55a9..04a8a02ecd 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -815,6 +815,17 @@ Delete pick &lt;nolink&gt;[PICK]&lt;/nolink&gt;?
      yestext="OK"/>
   </notification>
 
+  <notification
+   icon="alertmodal.tga"
+   name="DeleteOutfits"
+   type="alertmodal">
+    Delete the selected outfit/s?
+    <usetemplate
+     name="okcancelbuttons"
+     notext="Cancel"
+     yestext="OK"/>
+  </notification>
+
   <notification
    icon="alertmodal.tga"
    name="PromptGoToEventsPage"
-- 
cgit v1.2.3


From f92e50c54246add3afc752f86f072b23bdb2e5ad Mon Sep 17 00:00:00 2001
From: Paul Guslisty <pguslisty@productengine.com>
Date: Tue, 6 Jul 2010 14:34:43 +0300
Subject: EXT-8150 FIXED (+ button under \"add more\" of outfit editor is
 unclear)

- Decreased flat list view and folder list view height
- Deleted '+' button from bottom bar
- Added 'Wear Item' button just at the bottom of the list

Reviewed by Vadim Savchuk at https://codereview.productengine.com/secondlife/r/693/

--HG--
branch : product-engine
---
 .../skins/default/xui/en/panel_outfit_edit.xml     | 32 ++++++++++------------
 1 file changed, 14 insertions(+), 18 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/panel_outfit_edit.xml b/indra/newview/skins/default/xui/en/panel_outfit_edit.xml
index 0fc945126b..adc38b966c 100644
--- a/indra/newview/skins/default/xui/en/panel_outfit_edit.xml
+++ b/indra/newview/skins/default/xui/en/panel_outfit_edit.xml
@@ -290,7 +290,7 @@ It is calculated as border_size + 2*UIResizeBarOverlap
 
 
         <layout_panel
-         background_visible="true"
+         background_visible="false"
          bg_alpha_color="DkGray2"
          auto_resize="true"
          default_tab_group="3"
@@ -317,7 +317,7 @@ It is calculated as border_size + 2*UIResizeBarOverlap
              background_visible="false"
              border="false"
              follows="left|top|right|bottom"
-             height="449"
+             height="418"
              layout="topleft"
              left="0"
              mouse_opaque="false"
@@ -332,7 +332,7 @@ It is calculated as border_size + 2*UIResizeBarOverlap
              layout="topleft"
              follows="left|top|right|bottom"
              border="false"
-             height="449"
+             height="418"
              left="0"
              mouse_opaque="false"
              width="310"
@@ -346,10 +346,19 @@ It is calculated as border_size + 2*UIResizeBarOverlap
                  follows="all"
                  multi_select="true"
                  width="313"
-                 height="449"
+                 height="418"
                  left="0"
                  top="0"/>
             </panel>
+            <button
+	         follows="bottom|left"
+	         height="22"
+	         left="2"
+	         label="Wear Item"
+	         layout="topleft"
+	         name="plus_btn"
+	         top_pad="5"
+	         width="130" />
 
         </layout_panel>
     </layout_stack>
@@ -451,19 +460,6 @@ It is calculated as border_size + 2*UIResizeBarOverlap
          name="list_view_btn"
          top="1"
          width="31" />
-        <button
-         follows="bottom|left"
-         height="25"
-         image_hover_unselected="Toolbar_Middle_Over"
-         image_overlay="AddItem_Off"
-         image_selected="Toolbar_Middle_Selected"
-         image_unselected="Toolbar_Middle_Off"
-         label=""
-         layout="topleft"
-         left_pad="1"
-         name="plus_btn"
-         top="1"
-         width="31" />
         <icon
          follows="bottom|left|right"
          height="25"
@@ -471,7 +467,7 @@ It is calculated as border_size + 2*UIResizeBarOverlap
          layout="topleft"
          left_pad="1"
          name="dummy_right_icon"
-         width="154" >
+         width="186" >
         </icon>
         <button
          follows="bottom|right"
-- 
cgit v1.2.3


From 3e7af3244f20f64b2d1c5ebc8d9f1fa616bee104 Mon Sep 17 00:00:00 2001
From: Andrew Polunin <apolunin@productengine.com>
Date: Tue, 6 Jul 2010 17:30:20 +0300
Subject: EXT-7536 FIXED (Favorites bar and Navigation bar looks similar to the
 mock-up)

- Added constant FAVBAR_TOP_PADDING in the LLNavigationBar which defines the distance between navigation panel and favorites panel in pixels.
- Added new image NavBar_BG_NoFav_Bevel which is used to show navigation panel with favorites bar hidden. It is required to show navigation panel with bevel at the bottom.
- Added new image NavBar_BG_NoNav_Bevel which is used to show favorites panel with navigation panel hidden. It is required to show favorites panel with bevel at the top.
- Removed image NavBar_BG_NoFav. It is not used anymore.
- Modified the methods showNavigationPanel and showFavoritesPanel to take into account that distance.

Reviewed by Vadim Savchuk at https://codereview.productengine.com/secondlife/r/664/

--HG--
branch : product-engine
---
 .../skins/default/xui/en/panel_navigation_bar.xml       | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/panel_navigation_bar.xml b/indra/newview/skins/default/xui/en/panel_navigation_bar.xml
index 00b1fdd843..2c9d7e4b6a 100644
--- a/indra/newview/skins/default/xui/en/panel_navigation_bar.xml
+++ b/indra/newview/skins/default/xui/en/panel_navigation_bar.xml
@@ -22,14 +22,25 @@
 	 width="600"/>
 	<icon
 	 follows="all"
-	 image_name="NavBar_BG_NoFav"
+	 image_name="NavBar_BG_NoFav_Bevel"
 	 mouse_opaque="false"
-	 name="bg_icon_no_fav"
+	 name="bg_icon_no_fav_bevel"
 	 scale_image="true"
 	 visible="false"
 	 left="0"
 	 top="0"
-	 height="50"
+	 height="60"
+	 width="600"/>
+	<icon
+	 follows="all"
+	 image_name="NavBar_BG_NoNav_Bevel"
+	 mouse_opaque="false"
+	 name="bg_icon_no_nav_bevel"
+	 scale_image="true"
+	 visible="false"
+	 left="0"
+	 top="0"
+	 height="60"
 	 width="600"/>
 	<panel
 	 background_visible="false"
-- 
cgit v1.2.3


From d7a1237f87048a49cf047b501987fcd82dd052e0 Mon Sep 17 00:00:00 2001
From: Loren Shih <seraph@lindenlab.com>
Date: Tue, 6 Jul 2010 12:01:25 -0400
Subject: EXT-8247 FIXED In-world object info in Edit->General menu clipped

Trivial change to move down the Name: field by a few pixels.
---
 indra/newview/skins/default/xui/en/floater_tools.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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

diff --git a/indra/newview/skins/default/xui/en/floater_tools.xml b/indra/newview/skins/default/xui/en/floater_tools.xml
index 34c1b25f8c..194a93977f 100644
--- a/indra/newview/skins/default/xui/en/floater_tools.xml
+++ b/indra/newview/skins/default/xui/en/floater_tools.xml
@@ -823,7 +823,7 @@
              height="10"
              left="10"
              name="Name:"
-             top="0"
+             top="5"
              width="90">
                 Name:
             </text>
-- 
cgit v1.2.3