From fd03ae299bfaf83789e511912d99d204c0833e7f Mon Sep 17 00:00:00 2001
From: Leyla Farazha <leyla@lindenlab.com>
Date: Mon, 10 Oct 2011 17:08:51 -0700
Subject: EXP-1274 Create floater for "Avatar Picker" content EXP-1299 Nearby
 Voice floater can't be closed by clicking the sidebar button again. EXP-1306
 Prompt text to "Change your avatar" and "Destinations" floaters get pushed
 down one line when the floater dialog gets resized to minimum width

---
 indra/newview/skins/default/xui/en/floater_avatar.xml       | 6 ++----
 indra/newview/skins/default/xui/en/floater_destinations.xml | 5 ++---
 2 files changed, 4 insertions(+), 7 deletions(-)

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/floater_avatar.xml b/indra/newview/skins/default/xui/en/floater_avatar.xml
index a0c1f4c021..666aa2d164 100644
--- a/indra/newview/skins/default/xui/en/floater_avatar.xml
+++ b/indra/newview/skins/default/xui/en/floater_avatar.xml
@@ -3,11 +3,9 @@
  legacy_header_height="225"
  can_minimize="true"
  can_close="true"
- user_resize="true"
  can_resize="true"
  min_height="230"
- min_width="455"
- max_height="230"
+ min_width="445"
  height="230"
  layout="topleft"
  name="Avatar"
@@ -19,7 +17,7 @@
     <web_browser
       top="25"
       height="200"
-      width="435"
+      width="445"
       follows="all"
       name="avatar_picker_contents"
       trusted_content="true"/>
diff --git a/indra/newview/skins/default/xui/en/floater_destinations.xml b/indra/newview/skins/default/xui/en/floater_destinations.xml
index 9dd9338f37..669b7eb15a 100644
--- a/indra/newview/skins/default/xui/en/floater_destinations.xml
+++ b/indra/newview/skins/default/xui/en/floater_destinations.xml
@@ -7,7 +7,6 @@
  can_resize="true"
  min_height="230"
  min_width="525"
- max_height="230"
  height="230"
  layout="topleft"
  name="Destinations"
@@ -15,11 +14,11 @@
  help_topic="destinations"
  save_rect="true"
  title="Destinations"
- width="445">
+ width="525">
     <web_browser
       top="25"
       height="200"
-      width="435"
+      width="525"
       follows="all"
       name="destination_guide_contents"
       start_url="http://common-flash-secondlife-com.s3.amazonaws.com/viewer/v2.6/agni/guide.html"
-- 
cgit v1.2.3


From 6a570a9bdc2660e4db87e8e7a65b724e1ad8d1b2 Mon Sep 17 00:00:00 2001
From: Richard Nelson <richard@lindenlab.com>
Date: Mon, 10 Oct 2011 17:52:37 -0700
Subject: fixed icons moving when clicking on icon-only toolbars

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

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/widgets/toolbar.xml b/indra/newview/skins/default/xui/en/widgets/toolbar.xml
index 09967de7cc..be5dfaf18c 100644
--- a/indra/newview/skins/default/xui/en/widgets/toolbar.xml
+++ b/indra/newview/skins/default/xui/en/widgets/toolbar.xml
@@ -31,6 +31,8 @@
                         flash_color="EmphasisColor"/>
   <button_icon pad_left="10"
                pad_right="10"
+               image_bottom_pad="10"
+               image_top_pad="10"
                image_pressed="PushButton_Press"
                image_pressed_selected="PushButton_Selected_Press"
                image_selected="PushButton_Selected_Press"
-- 
cgit v1.2.3


From 71879916428e9e15081d73696f46bb4a32877265 Mon Sep 17 00:00:00 2001
From: Merov Linden <merov@lindenlab.com>
Date: Mon, 10 Oct 2011 19:03:40 -0700
Subject: EXP-1300 : Add the caret images and xml (no code yet)

---
 indra/newview/skins/default/textures/textures.xml  |   3 +++
 .../textures/toolbar_icons/caret_bottom.png        | Bin 0 -> 139 bytes
 .../default/textures/toolbar_icons/caret_left.png  | Bin 0 -> 893 bytes
 .../default/textures/toolbar_icons/caret_right.png | Bin 0 -> 892 bytes
 .../skins/default/xui/en/panel_toolbar_view.xml    |  30 +++++++++++++++++++++
 5 files changed, 33 insertions(+)
 create mode 100644 indra/newview/skins/default/textures/toolbar_icons/caret_bottom.png
 create mode 100644 indra/newview/skins/default/textures/toolbar_icons/caret_left.png
 create mode 100644 indra/newview/skins/default/textures/toolbar_icons/caret_right.png

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/textures/textures.xml b/indra/newview/skins/default/textures/textures.xml
index e7fb836f45..27577d42ea 100644
--- a/indra/newview/skins/default/textures/textures.xml
+++ b/indra/newview/skins/default/textures/textures.xml
@@ -149,6 +149,9 @@ with the same filename but different name
   <texture name="Command_Speak_Icon"        file_name="toolbar_icons/speak.png"        preload="true" />
   <texture name="Command_View_Icon"         file_name="toolbar_icons/view.png"         preload="true" />
   <texture name="Command_Voice_Icon"        file_name="toolbar_icons/nearbyvoice.png"  preload="true" />
+  <texture name="Caret_Bottom_Icon"         file_name="toolbar_icons/caret_bottom.png" preload="true" />
+  <texture name="Caret_Right_Icon"          file_name="toolbar_icons/caret_right.png"  preload="true" />
+  <texture name="Caret_Left_Icon"           file_name="toolbar_icons/caret_left.png"   preload="true" />
 
   <texture name="ComboButton_Disabled" file_name="widgets/ComboButton_Disabled.png" preload="true" scale.left="2" scale.top="19" scale.right="18" scale.bottom="2" />
   <texture name="ComboButton_Selected" file_name="widgets/ComboButton_Selected.png" preload="true" scale.left="2" scale.top="19" scale.right="18" scale.bottom="2" />
diff --git a/indra/newview/skins/default/textures/toolbar_icons/caret_bottom.png b/indra/newview/skins/default/textures/toolbar_icons/caret_bottom.png
new file mode 100644
index 0000000000..82f58b22b9
Binary files /dev/null and b/indra/newview/skins/default/textures/toolbar_icons/caret_bottom.png differ
diff --git a/indra/newview/skins/default/textures/toolbar_icons/caret_left.png b/indra/newview/skins/default/textures/toolbar_icons/caret_left.png
new file mode 100644
index 0000000000..75eecc84ed
Binary files /dev/null and b/indra/newview/skins/default/textures/toolbar_icons/caret_left.png differ
diff --git a/indra/newview/skins/default/textures/toolbar_icons/caret_right.png b/indra/newview/skins/default/textures/toolbar_icons/caret_right.png
new file mode 100644
index 0000000000..677459ae1c
Binary files /dev/null and b/indra/newview/skins/default/textures/toolbar_icons/caret_right.png differ
diff --git a/indra/newview/skins/default/xui/en/panel_toolbar_view.xml b/indra/newview/skins/default/xui/en/panel_toolbar_view.xml
index bc96bfbab5..5d6967ed32 100644
--- a/indra/newview/skins/default/xui/en/panel_toolbar_view.xml
+++ b/indra/newview/skins/default/xui/en/panel_toolbar_view.xml
@@ -47,6 +47,16 @@
                  bottom="-10"
                  side="left"
                  button_display_mode="icons_only">
+	             <icon layout="topleft"
+	                   height="7"
+	                   width="5"
+	                   follows="left|top"
+	                   top="20"
+	                   left="10"
+	                   tab_stop="false" 
+                       visible="false"
+	                   image_name="Caret_Left_Icon"
+                       name="caret" />
         </toolbar>
       </layout_panel>
       <layout_panel name="non_toolbar_panel"
@@ -88,6 +98,16 @@
           bottom="-10"
           side="right"
           button_display_mode="icons_only">
+	      <icon layout="topleft"
+	            height="7"
+	            width="5"
+	            follows="left|top"
+	            top="20"
+	            left="10"
+	            tab_stop="false" 
+                visible="false"
+	            image_name="Caret_Right_Icon"
+	            name="caret" />
         </toolbar>
       </layout_panel>
     </layout_stack>
@@ -109,6 +129,16 @@
              follows="left|right|bottom"
              button_display_mode="icons_with_text"
              visible="true">
+             <icon layout="topleft"
+	            height="5"
+	            width="7"
+	            follows="left|top"
+	            top="20"
+	            left="10"
+	            tab_stop="false" 
+                visible="false"
+	            image_name="Caret_Bottom_Icon"
+	            name="caret" />
     </toolbar>
   </layout_panel>
   </layout_stack>
-- 
cgit v1.2.3