From fba3f5dfd6ab51debd97c2c0e635ddcad388bcfe Mon Sep 17 00:00:00 2001
From: Leslie Linden <leslie@lindenlab.com>
Date: Mon, 10 Oct 2011 15:44:31 -0700
Subject: Added picks command and icon.  Changed toolbar button text layout to
 halign left.

---
 indra/newview/skins/default/xui/en/floater_toybox.xml  | 1 +
 indra/newview/skins/default/xui/en/strings.xml         | 2 ++
 indra/newview/skins/default/xui/en/widgets/toolbar.xml | 2 ++
 3 files changed, 5 insertions(+)

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

diff --git a/indra/newview/skins/default/xui/en/floater_toybox.xml b/indra/newview/skins/default/xui/en/floater_toybox.xml
index 653788bd3c..90b7e906a5 100644
--- a/indra/newview/skins/default/xui/en/floater_toybox.xml
+++ b/indra/newview/skins/default/xui/en/floater_toybox.xml
@@ -74,6 +74,7 @@
                           image_color="ButtonImageColor"
                           image_color_disabled="ButtonImageColor"
                           flash_color="ButtonUnselectedFgColor"
+                          halign="left"
                           hover_glow_amount="0.15"
                           display_pressed_state="false" />
   </toolbar>
diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index f021fdd6a1..d12dda88be 100644
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -3668,6 +3668,7 @@ Try enclosing path to the editor with double quotes.
   <string name="Command_MiniMap_Label">Mini-map</string>
   <string name="Command_Move_Label">Move</string>
   <string name="Command_People_Label">People</string>
+  <string name="Command_Picks_Label">Picks</string>
   <string name="Command_Places_Label">Places</string>
   <string name="Command_Preferences_Label">Preferences</string>
   <string name="Command_Profile_Label">Profile</string>
@@ -3692,6 +3693,7 @@ Try enclosing path to the editor with double quotes.
   <string name="Command_MiniMap_Tooltip">Show nearby people</string>
   <string name="Command_Move_Tooltip">Moving your avatar</string>
   <string name="Command_People_Tooltip">Friends, groups, and nearby people</string>
+  <string name="Command_Picks_Tooltip">Favorite places</string>
   <string name="Command_Places_Tooltip">Places you've saved</string>
   <string name="Command_Preferences_Tooltip">Preferences</string>
   <string name="Command_Profile_Tooltip">Edit or view your profile</string>
diff --git a/indra/newview/skins/default/xui/en/widgets/toolbar.xml b/indra/newview/skins/default/xui/en/widgets/toolbar.xml
index 60e7c34d84..09967de7cc 100644
--- a/indra/newview/skins/default/xui/en/widgets/toolbar.xml
+++ b/indra/newview/skins/default/xui/en/widgets/toolbar.xml
@@ -14,6 +14,7 @@
                 background_opaque="true"/>
   <button_icon_and_text imgoverlay_label_space="7"
                         label_color_selected="White"
+                        halign="left"
                         image_pressed="PushButton_Press"
                         image_pressed_selected="PushButton_Selected_Press"
                         image_selected="PushButton_Selected_Press"
@@ -38,6 +39,7 @@
                button_width.max="38"               
                follows="left|top"
                label=""
+               halign="left"
                chrome="true"
                use_ellipses="true"
                auto_resize="true"
-- 
cgit v1.2.3