From fbe563fdf44c1843de29e189f05203fa4ab20d61 Mon Sep 17 00:00:00 2001
From: Richard Linden <none@none>
Date: Fri, 7 Oct 2011 12:03:29 -0700
Subject: adjusted toolbar padding per spec

---
 indra/newview/skins/default/xui/en/panel_toolbar_view.xml | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'indra/newview/skins')

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 44da813f61..31a26dab7f 100644
--- a/indra/newview/skins/default/xui/en/panel_toolbar_view.xml
+++ b/indra/newview/skins/default/xui/en/panel_toolbar_view.xml
@@ -41,10 +41,10 @@
         <toolbar follows="left|top|bottom"
                  button_panel.bg_opaque_image="Rounded_Rect_Right"
                  name="toolbar_left"
-                 height="500"
                  width="30"
                  left="0"
-                 top="0"
+                 top="10"
+                 bottom="-10"
                  side="left"
                  button_display_mode="icons_only">
         </toolbar>
@@ -63,10 +63,10 @@
           button_panel.bg_opaque_image="Rounded_Rect_Left"
           follows="right|top|bottom"
           name="toolbar_right"
-          height="500"
           width="30"
           left="0"
-          top="0"
+          top="10"
+          bottom="-10"
           side="right"
           button_display_mode="icons_only">
         </toolbar>
@@ -83,8 +83,8 @@
              button_panel.bg_opaque_image="Rounded_Rect_Top"
              name="toolbar_bottom"
              height="30"
-             width="1024"
-             left="0"
+             left="40"
+             right="-40"
              top="0"
              side="bottom"
              follows="left|right|bottom"
-- 
cgit v1.2.3


From ca2f043ffeb0b6f7c0a5ea171411c45f6dcc0bf4 Mon Sep 17 00:00:00 2001
From: Richard Linden <none@none>
Date: Fri, 7 Oct 2011 12:09:16 -0700
Subject: moved stand/stop flying buttons to above bottom toolbar

---
 indra/newview/skins/default/xui/en/main_view.xml          |  9 ---------
 indra/newview/skins/default/xui/en/panel_toolbar_view.xml | 14 +++++++++++++-
 2 files changed, 13 insertions(+), 10 deletions(-)

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/main_view.xml b/indra/newview/skins/default/xui/en/main_view.xml
index cf566d7d23..57baa7cdd3 100644
--- a/indra/newview/skins/default/xui/en/main_view.xml
+++ b/indra/newview/skins/default/xui/en/main_view.xml
@@ -90,15 +90,6 @@
                      top="0"
                      visible="false"
                      width="1024"/>
-              <panel bottom="500"
-                     follows="left|right|bottom"
-                     height="25"
-                     left="0"
-                     mouse_opaque="false"
-                     tab_stop="false"
-                     name="stand_stop_flying_container"
-                     visible="false"
-                     width="500"/>
             </layout_panel>
             <!--<layout_panel auto_resize="false"
                    min_height="33"
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 31a26dab7f..03d45887d4 100644
--- a/indra/newview/skins/default/xui/en/panel_toolbar_view.xml
+++ b/indra/newview/skins/default/xui/en/panel_toolbar_view.xml
@@ -52,7 +52,19 @@
       <layout_panel name="non_toolbar_panel"
                     auto_resize="true"
                     user_resize="false"
-                    mouse_opaque="false"/>
+                    mouse_opaque="false"
+                    height="100"
+                    width="100">
+        <panel bottom="100"
+               follows="left|right|bottom"
+               height="25"
+               left="0"
+               mouse_opaque="false"
+               tab_stop="false"
+               name="stand_stop_flying_container"
+               visible="false"
+               width="100"/>
+      </layout_panel>
       <layout_panel name="right_toolbar_panel"
                     auto_resize="false"
                     user_resize="false"
-- 
cgit v1.2.3


From 3a280f747dae737fd03bd4c2c886aa6231c0b703 Mon Sep 17 00:00:00 2001
From: Leslie Linden <leslie@lindenlab.com>
Date: Fri, 7 Oct 2011 15:18:14 -0700
Subject: Button iconshg pullhg pullhg pull111

---
 indra/newview/skins/default/textures/textures.xml  |  46 ++++++++++-----------
 .../default/textures/toolbar_icons/appearance.png  | Bin 0 -> 1205 bytes
 .../default/textures/toolbar_icons/avatars.png     | Bin 0 -> 1432 bytes
 .../skins/default/textures/toolbar_icons/build.png | Bin 0 -> 1246 bytes
 .../skins/default/textures/toolbar_icons/chat.png  | Bin 0 -> 1277 bytes
 .../textures/toolbar_icons/destinations.png        | Bin 0 -> 1297 bytes
 .../default/textures/toolbar_icons/gestures.png    | Bin 0 -> 1675 bytes
 .../skins/default/textures/toolbar_icons/howto.png | Bin 0 -> 1306 bytes
 .../default/textures/toolbar_icons/inventory.png   | Bin 0 -> 1114 bytes
 .../skins/default/textures/toolbar_icons/land.png  | Bin 0 -> 1123 bytes
 .../skins/default/textures/toolbar_icons/map.png   | Bin 0 -> 1206 bytes
 .../default/textures/toolbar_icons/marketplace.png | Bin 0 -> 1311 bytes
 .../default/textures/toolbar_icons/mini_map.png    | Bin 0 -> 1645 bytes
 .../skins/default/textures/toolbar_icons/move.png  | Bin 0 -> 1322 bytes
 .../default/textures/toolbar_icons/nearbyvoice.png | Bin 0 -> 1280 bytes
 .../default/textures/toolbar_icons/people.png      | Bin 0 -> 1313 bytes
 .../default/textures/toolbar_icons/places.png      | Bin 0 -> 1391 bytes
 .../default/textures/toolbar_icons/preferences.png | Bin 0 -> 1427 bytes
 .../default/textures/toolbar_icons/profile.png     | Bin 0 -> 1180 bytes
 .../default/textures/toolbar_icons/search.png      | Bin 0 -> 1406 bytes
 .../default/textures/toolbar_icons/snapshot.png    | Bin 0 -> 1142 bytes
 .../skins/default/textures/toolbar_icons/speak.png | Bin 0 -> 1253 bytes
 .../skins/default/textures/toolbar_icons/view.png  | Bin 0 -> 1618 bytes
 23 files changed, 23 insertions(+), 23 deletions(-)
 create mode 100644 indra/newview/skins/default/textures/toolbar_icons/appearance.png
 create mode 100644 indra/newview/skins/default/textures/toolbar_icons/avatars.png
 create mode 100644 indra/newview/skins/default/textures/toolbar_icons/build.png
 create mode 100644 indra/newview/skins/default/textures/toolbar_icons/chat.png
 create mode 100644 indra/newview/skins/default/textures/toolbar_icons/destinations.png
 create mode 100644 indra/newview/skins/default/textures/toolbar_icons/gestures.png
 create mode 100644 indra/newview/skins/default/textures/toolbar_icons/howto.png
 create mode 100644 indra/newview/skins/default/textures/toolbar_icons/inventory.png
 create mode 100644 indra/newview/skins/default/textures/toolbar_icons/land.png
 create mode 100644 indra/newview/skins/default/textures/toolbar_icons/map.png
 create mode 100644 indra/newview/skins/default/textures/toolbar_icons/marketplace.png
 create mode 100644 indra/newview/skins/default/textures/toolbar_icons/mini_map.png
 create mode 100644 indra/newview/skins/default/textures/toolbar_icons/move.png
 create mode 100644 indra/newview/skins/default/textures/toolbar_icons/nearbyvoice.png
 create mode 100644 indra/newview/skins/default/textures/toolbar_icons/people.png
 create mode 100644 indra/newview/skins/default/textures/toolbar_icons/places.png
 create mode 100644 indra/newview/skins/default/textures/toolbar_icons/preferences.png
 create mode 100644 indra/newview/skins/default/textures/toolbar_icons/profile.png
 create mode 100644 indra/newview/skins/default/textures/toolbar_icons/search.png
 create mode 100644 indra/newview/skins/default/textures/toolbar_icons/snapshot.png
 create mode 100644 indra/newview/skins/default/textures/toolbar_icons/speak.png
 create mode 100644 indra/newview/skins/default/textures/toolbar_icons/view.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 a98ef58f50..0e4b354e0d 100644
--- a/indra/newview/skins/default/textures/textures.xml
+++ b/indra/newview/skins/default/textures/textures.xml
@@ -125,29 +125,29 @@ with the same filename but different name
   <texture name="Checkbox_Press" file_name="widgets/Checkbox_Press.png" preload="true" />
   <texture name="Check_Mark" file_name="icons/check_mark" preload="true" />
 
-  <texture name="Command_AboutLand_Icon"    file_name="taskpanel/TabIcon_Home_Off.png" preload="true" />
-  <texture name="Command_Appearance_Icon"   file_name="taskpanel/TabIcon_Home_Off.png" preload="true" />
-  <texture name="Command_Avatar_Icon"       file_name="taskpanel/TabIcon_Home_Off.png" preload="true" />
-  <texture name="Command_Build_Icon"        file_name="taskpanel/TabIcon_Home_Off.png" preload="true" />
-  <texture name="Command_Chat_Icon"         file_name="taskpanel/TabIcon_Home_Off.png" preload="true" />
-  <texture name="Command_Compass_Icon"      file_name="taskpanel/TabIcon_Home_Off.png" preload="true" />
-  <texture name="Command_Destinations_Icon" file_name="taskpanel/TabIcon_Home_Off.png" preload="true" />
-  <texture name="Command_Gestures_Icon"     file_name="taskpanel/TabIcon_Home_Off.png" preload="true" />
-  <texture name="Command_HowTo_Icon"        file_name="taskpanel/TabIcon_Home_Off.png" preload="true" />
-  <texture name="Command_Inventory_Icon"    file_name="taskpanel/TabIcon_Home_Off.png" preload="true" />
-  <texture name="Command_Map_Icon"          file_name="taskpanel/TabIcon_Home_Off.png" preload="true" />
-  <texture name="Command_Marketplace_Icon"  file_name="taskpanel/TabIcon_Home_Off.png" preload="true" />
-  <texture name="Command_MiniMap_Icon"      file_name="taskpanel/TabIcon_Home_Off.png" preload="true" />
-  <texture name="Command_Move_Icon"         file_name="taskpanel/TabIcon_Home_Off.png" preload="true" />
-  <texture name="Command_People_Icon"       file_name="taskpanel/TabIcon_Home_Off.png" preload="true" />
-  <texture name="Command_Places_Icon"       file_name="taskpanel/TabIcon_Home_Off.png" preload="true" />
-  <texture name="Command_Preferences_Icon"  file_name="taskpanel/TabIcon_Home_Off.png" preload="true" />
-  <texture name="Command_Profile_Icon"      file_name="taskpanel/TabIcon_Home_Off.png" preload="true" />
-  <texture name="Command_Search_Icon"       file_name="taskpanel/TabIcon_Home_Off.png" preload="true" />
-  <texture name="Command_Snapshot_Icon"     file_name="taskpanel/TabIcon_Home_Off.png" preload="true" />
-  <texture name="Command_Speak_Icon"        file_name="taskpanel/TabIcon_Home_Off.png" preload="true" />
-  <texture name="Command_View_Icon"         file_name="taskpanel/TabIcon_Home_Off.png" preload="true" />
-  <texture name="Command_Voice_Icon"        file_name="taskpanel/TabIcon_Home_Off.png" preload="true" />
+  <texture name="Command_AboutLand_Icon"    file_name="toolbar_icons/land.png" preload="true" />
+  <texture name="Command_Appearance_Icon"   file_name="toolbar_icons/appearance.png" preload="true" />
+  <texture name="Command_Avatar_Icon"       file_name="toolbar_icons/avatars.png" preload="true" />
+  <texture name="Command_Build_Icon"        file_name="toolbar_icons/build.png" preload="true" />
+  <texture name="Command_Chat_Icon"         file_name="toolbar_icons/chat.png" preload="true" />
+  <texture name="Command_Compass_Icon"      file_name="toolbar_icons/land.png" preload="true" />
+  <texture name="Command_Destinations_Icon" file_name="toolbar_icons/destinations.png" preload="true" />
+  <texture name="Command_Gestures_Icon"     file_name="toolbar_icons/gestures.png" preload="true" />
+  <texture name="Command_HowTo_Icon"        file_name="toolbar_icons/howto.png" preload="true" />
+  <texture name="Command_Inventory_Icon"    file_name="toolbar_icons/inventory.png" preload="true" />
+  <texture name="Command_Map_Icon"          file_name="toolbar_icons/map.png" preload="true" />
+  <texture name="Command_Marketplace_Icon"  file_name="toolbar_icons/marketplace.png" preload="true" />
+  <texture name="Command_MiniMap_Icon"      file_name="toolbar_icons/mini_map.png" preload="true" />
+  <texture name="Command_Move_Icon"         file_name="toolbar_icons/move.png" preload="true" />
+  <texture name="Command_People_Icon"       file_name="toolbar_icons/people.png" preload="true" />
+  <texture name="Command_Places_Icon"       file_name="toolbar_icons/places.png" preload="true" />
+  <texture name="Command_Preferences_Icon"  file_name="toolbar_icons/preferences.png" preload="true" />
+  <texture name="Command_Profile_Icon"      file_name="toolbar_icons/profile.png" preload="true" />
+  <texture name="Command_Search_Icon"       file_name="toolbar_icons/search.png" preload="true" />
+  <texture name="Command_Snapshot_Icon"     file_name="toolbar_icons/snapshot.png" preload="true" />
+  <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="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/appearance.png b/indra/newview/skins/default/textures/toolbar_icons/appearance.png
new file mode 100644
index 0000000000..e6b1365388
Binary files /dev/null and b/indra/newview/skins/default/textures/toolbar_icons/appearance.png differ
diff --git a/indra/newview/skins/default/textures/toolbar_icons/avatars.png b/indra/newview/skins/default/textures/toolbar_icons/avatars.png
new file mode 100644
index 0000000000..8fa0600cee
Binary files /dev/null and b/indra/newview/skins/default/textures/toolbar_icons/avatars.png differ
diff --git a/indra/newview/skins/default/textures/toolbar_icons/build.png b/indra/newview/skins/default/textures/toolbar_icons/build.png
new file mode 100644
index 0000000000..e21ab3f0e4
Binary files /dev/null and b/indra/newview/skins/default/textures/toolbar_icons/build.png differ
diff --git a/indra/newview/skins/default/textures/toolbar_icons/chat.png b/indra/newview/skins/default/textures/toolbar_icons/chat.png
new file mode 100644
index 0000000000..e0dbac495f
Binary files /dev/null and b/indra/newview/skins/default/textures/toolbar_icons/chat.png differ
diff --git a/indra/newview/skins/default/textures/toolbar_icons/destinations.png b/indra/newview/skins/default/textures/toolbar_icons/destinations.png
new file mode 100644
index 0000000000..e2325f083a
Binary files /dev/null and b/indra/newview/skins/default/textures/toolbar_icons/destinations.png differ
diff --git a/indra/newview/skins/default/textures/toolbar_icons/gestures.png b/indra/newview/skins/default/textures/toolbar_icons/gestures.png
new file mode 100644
index 0000000000..2404bb4e25
Binary files /dev/null and b/indra/newview/skins/default/textures/toolbar_icons/gestures.png differ
diff --git a/indra/newview/skins/default/textures/toolbar_icons/howto.png b/indra/newview/skins/default/textures/toolbar_icons/howto.png
new file mode 100644
index 0000000000..8594d71113
Binary files /dev/null and b/indra/newview/skins/default/textures/toolbar_icons/howto.png differ
diff --git a/indra/newview/skins/default/textures/toolbar_icons/inventory.png b/indra/newview/skins/default/textures/toolbar_icons/inventory.png
new file mode 100644
index 0000000000..ab3191255e
Binary files /dev/null and b/indra/newview/skins/default/textures/toolbar_icons/inventory.png differ
diff --git a/indra/newview/skins/default/textures/toolbar_icons/land.png b/indra/newview/skins/default/textures/toolbar_icons/land.png
new file mode 100644
index 0000000000..89ea7604a4
Binary files /dev/null and b/indra/newview/skins/default/textures/toolbar_icons/land.png differ
diff --git a/indra/newview/skins/default/textures/toolbar_icons/map.png b/indra/newview/skins/default/textures/toolbar_icons/map.png
new file mode 100644
index 0000000000..ed1049b7db
Binary files /dev/null and b/indra/newview/skins/default/textures/toolbar_icons/map.png differ
diff --git a/indra/newview/skins/default/textures/toolbar_icons/marketplace.png b/indra/newview/skins/default/textures/toolbar_icons/marketplace.png
new file mode 100644
index 0000000000..62bad20be6
Binary files /dev/null and b/indra/newview/skins/default/textures/toolbar_icons/marketplace.png differ
diff --git a/indra/newview/skins/default/textures/toolbar_icons/mini_map.png b/indra/newview/skins/default/textures/toolbar_icons/mini_map.png
new file mode 100644
index 0000000000..b66af223bb
Binary files /dev/null and b/indra/newview/skins/default/textures/toolbar_icons/mini_map.png differ
diff --git a/indra/newview/skins/default/textures/toolbar_icons/move.png b/indra/newview/skins/default/textures/toolbar_icons/move.png
new file mode 100644
index 0000000000..5854110782
Binary files /dev/null and b/indra/newview/skins/default/textures/toolbar_icons/move.png differ
diff --git a/indra/newview/skins/default/textures/toolbar_icons/nearbyvoice.png b/indra/newview/skins/default/textures/toolbar_icons/nearbyvoice.png
new file mode 100644
index 0000000000..5bdcb22aa5
Binary files /dev/null and b/indra/newview/skins/default/textures/toolbar_icons/nearbyvoice.png differ
diff --git a/indra/newview/skins/default/textures/toolbar_icons/people.png b/indra/newview/skins/default/textures/toolbar_icons/people.png
new file mode 100644
index 0000000000..7228ae8e2f
Binary files /dev/null and b/indra/newview/skins/default/textures/toolbar_icons/people.png differ
diff --git a/indra/newview/skins/default/textures/toolbar_icons/places.png b/indra/newview/skins/default/textures/toolbar_icons/places.png
new file mode 100644
index 0000000000..97d9fa066c
Binary files /dev/null and b/indra/newview/skins/default/textures/toolbar_icons/places.png differ
diff --git a/indra/newview/skins/default/textures/toolbar_icons/preferences.png b/indra/newview/skins/default/textures/toolbar_icons/preferences.png
new file mode 100644
index 0000000000..df80d926b5
Binary files /dev/null and b/indra/newview/skins/default/textures/toolbar_icons/preferences.png differ
diff --git a/indra/newview/skins/default/textures/toolbar_icons/profile.png b/indra/newview/skins/default/textures/toolbar_icons/profile.png
new file mode 100644
index 0000000000..32fe2bf8ac
Binary files /dev/null and b/indra/newview/skins/default/textures/toolbar_icons/profile.png differ
diff --git a/indra/newview/skins/default/textures/toolbar_icons/search.png b/indra/newview/skins/default/textures/toolbar_icons/search.png
new file mode 100644
index 0000000000..bcb11e950d
Binary files /dev/null and b/indra/newview/skins/default/textures/toolbar_icons/search.png differ
diff --git a/indra/newview/skins/default/textures/toolbar_icons/snapshot.png b/indra/newview/skins/default/textures/toolbar_icons/snapshot.png
new file mode 100644
index 0000000000..d26da9b1d2
Binary files /dev/null and b/indra/newview/skins/default/textures/toolbar_icons/snapshot.png differ
diff --git a/indra/newview/skins/default/textures/toolbar_icons/speak.png b/indra/newview/skins/default/textures/toolbar_icons/speak.png
new file mode 100644
index 0000000000..10cd354c5c
Binary files /dev/null and b/indra/newview/skins/default/textures/toolbar_icons/speak.png differ
diff --git a/indra/newview/skins/default/textures/toolbar_icons/view.png b/indra/newview/skins/default/textures/toolbar_icons/view.png
new file mode 100644
index 0000000000..5425af87e0
Binary files /dev/null and b/indra/newview/skins/default/textures/toolbar_icons/view.png differ
-- 
cgit v1.2.3


From feabe29f356ca2bae5275a5cb0d772614166d2c5 Mon Sep 17 00:00:00 2001
From: Merov Linden <merov@lindenlab.com>
Date: Fri, 7 Oct 2011 18:30:57 -0700
Subject: EXP-1300 : Completed the drawing of drop zones on toolbars when
 dragging tools

---
 indra/newview/skins/default/colors.xml                    |  4 ++++
 indra/newview/skins/default/xui/en/panel_toolbar_view.xml | 12 ++++++------
 indra/newview/skins/default/xui/en/widgets/toolbar.xml    |  1 +
 3 files changed, 11 insertions(+), 6 deletions(-)

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/colors.xml b/indra/newview/skins/default/colors.xml
index b5cc949ebf..8baaa14595 100644
--- a/indra/newview/skins/default/colors.xml
+++ b/indra/newview/skins/default/colors.xml
@@ -795,6 +795,10 @@
     <color
      name="DirectChatColor"
      reference="LtOrange" />
+
+    <color
+      name="ToolbarDropZoneColor"
+      value=".48 .69 1 .5" />
   
     <!-- Generic color names (legacy) -->
   <color
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 44da813f61..7289001481 100644
--- a/indra/newview/skins/default/xui/en/panel_toolbar_view.xml
+++ b/indra/newview/skins/default/xui/en/panel_toolbar_view.xml
@@ -41,10 +41,10 @@
         <toolbar follows="left|top|bottom"
                  button_panel.bg_opaque_image="Rounded_Rect_Right"
                  name="toolbar_left"
-                 height="500"
+                 height="483"
                  width="30"
                  left="0"
-                 top="0"
+                 top="10"
                  side="left"
                  button_display_mode="icons_only">
         </toolbar>
@@ -63,10 +63,10 @@
           button_panel.bg_opaque_image="Rounded_Rect_Left"
           follows="right|top|bottom"
           name="toolbar_right"
-          height="500"
+          height="483"
           width="30"
           left="0"
-          top="0"
+          top="10"
           side="right"
           button_display_mode="icons_only">
         </toolbar>
@@ -83,8 +83,8 @@
              button_panel.bg_opaque_image="Rounded_Rect_Top"
              name="toolbar_bottom"
              height="30"
-             width="1024"
-             left="0"
+             width="944"
+             left="40"
              top="0"
              side="bottom"
              follows="left|right|bottom"
diff --git a/indra/newview/skins/default/xui/en/widgets/toolbar.xml b/indra/newview/skins/default/xui/en/widgets/toolbar.xml
index 613dc66762..d36b015005 100644
--- a/indra/newview/skins/default/xui/en/widgets/toolbar.xml
+++ b/indra/newview/skins/default/xui/en/widgets/toolbar.xml
@@ -4,6 +4,7 @@
          pad_top="1"
          pad_bottom="1"
          pad_between="1"
+         min_girth="24"
          mouse_opaque="false"
          read_only="false">
   <button_panel name="button_panel"
-- 
cgit v1.2.3


From da3c7da7a585ea14a5a494ac7f36e7714bc86ab8 Mon Sep 17 00:00:00 2001
From: Richard Nelson <richard@lindenlab.com>
Date: Mon, 10 Oct 2011 15:04:00 -0700
Subject: side toolbar buttons are now squares again

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

(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 d36b015005..60e7c34d84 100644
--- a/indra/newview/skins/default/xui/en/widgets/toolbar.xml
+++ b/indra/newview/skins/default/xui/en/widgets/toolbar.xml
@@ -33,9 +33,9 @@
                image_pressed="PushButton_Press"
                image_pressed_selected="PushButton_Selected_Press"
                image_selected="PushButton_Selected_Press"
-               desired_height="35"
-               button_width.min="35"
-               button_width.max="35"               
+               desired_height="38"
+               button_width.min="38"
+               button_width.max="38"               
                follows="left|top"
                label=""
                chrome="true"
-- 
cgit v1.2.3


From 0526d673093b2279777dc8be5aae9cc33cb1c822 Mon Sep 17 00:00:00 2001
From: Richard Nelson <richard@lindenlab.com>
Date: Mon, 10 Oct 2011 15:31:25 -0700
Subject: EXP-1312 FIX Floaters should appear in region not covered by toolbars
 moved floater snap region to middle of toolbars and constrained floaters to
 that snap region also made toybox floater pass all drag and drop events along
 to toolbar

---
 indra/newview/skins/default/xui/en/main_view.xml          | 7 -------
 indra/newview/skins/default/xui/en/panel_toolbar_view.xml | 7 +++++++
 2 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/main_view.xml b/indra/newview/skins/default/xui/en/main_view.xml
index 57baa7cdd3..96d070ae50 100644
--- a/indra/newview/skins/default/xui/en/main_view.xml
+++ b/indra/newview/skins/default/xui/en/main_view.xml
@@ -74,13 +74,6 @@
                           user_resize="false" 
                           name="hud container"
                           width="500">
-              <view top="0"
-                    follows="all"
-                    height="500"
-                    left="0"
-                    mouse_opaque="false"
-                    name="floater_snap_region"
-                    width="500"/>
               <panel follows="left|top"
                      height="19"
                      left="0"
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 03d45887d4..bc96bfbab5 100644
--- a/indra/newview/skins/default/xui/en/panel_toolbar_view.xml
+++ b/indra/newview/skins/default/xui/en/panel_toolbar_view.xml
@@ -55,6 +55,13 @@
                     mouse_opaque="false"
                     height="100"
                     width="100">
+        <view top="0"
+              follows="all"
+              height="100"
+              left="0"
+              mouse_opaque="false"
+              name="floater_snap_region"
+              width="100"/>
         <panel bottom="100"
                follows="left|right|bottom"
                height="25"
-- 
cgit v1.2.3


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/textures/textures.xml  |  45 +++++++++++----------
 .../skins/default/textures/toolbar_icons/picks.png | Bin 0 -> 1368 bytes
 .../skins/default/xui/en/floater_toybox.xml        |   1 +
 indra/newview/skins/default/xui/en/strings.xml     |   2 +
 .../skins/default/xui/en/widgets/toolbar.xml       |   2 +
 5 files changed, 28 insertions(+), 22 deletions(-)
 create mode 100644 indra/newview/skins/default/textures/toolbar_icons/picks.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 0e4b354e0d..e7fb836f45 100644
--- a/indra/newview/skins/default/textures/textures.xml
+++ b/indra/newview/skins/default/textures/textures.xml
@@ -125,29 +125,30 @@ with the same filename but different name
   <texture name="Checkbox_Press" file_name="widgets/Checkbox_Press.png" preload="true" />
   <texture name="Check_Mark" file_name="icons/check_mark" preload="true" />
 
-  <texture name="Command_AboutLand_Icon"    file_name="toolbar_icons/land.png" preload="true" />
-  <texture name="Command_Appearance_Icon"   file_name="toolbar_icons/appearance.png" preload="true" />
-  <texture name="Command_Avatar_Icon"       file_name="toolbar_icons/avatars.png" preload="true" />
-  <texture name="Command_Build_Icon"        file_name="toolbar_icons/build.png" preload="true" />
-  <texture name="Command_Chat_Icon"         file_name="toolbar_icons/chat.png" preload="true" />
-  <texture name="Command_Compass_Icon"      file_name="toolbar_icons/land.png" preload="true" />
+  <texture name="Command_AboutLand_Icon"    file_name="toolbar_icons/land.png"         preload="true" />
+  <texture name="Command_Appearance_Icon"   file_name="toolbar_icons/appearance.png"   preload="true" />
+  <texture name="Command_Avatar_Icon"       file_name="toolbar_icons/avatars.png"      preload="true" />
+  <texture name="Command_Build_Icon"        file_name="toolbar_icons/build.png"        preload="true" />
+  <texture name="Command_Chat_Icon"         file_name="toolbar_icons/chat.png"         preload="true" />
+  <texture name="Command_Compass_Icon"      file_name="toolbar_icons/land.png"         preload="true" />
   <texture name="Command_Destinations_Icon" file_name="toolbar_icons/destinations.png" preload="true" />
-  <texture name="Command_Gestures_Icon"     file_name="toolbar_icons/gestures.png" preload="true" />
-  <texture name="Command_HowTo_Icon"        file_name="toolbar_icons/howto.png" preload="true" />
-  <texture name="Command_Inventory_Icon"    file_name="toolbar_icons/inventory.png" preload="true" />
-  <texture name="Command_Map_Icon"          file_name="toolbar_icons/map.png" preload="true" />
-  <texture name="Command_Marketplace_Icon"  file_name="toolbar_icons/marketplace.png" preload="true" />
-  <texture name="Command_MiniMap_Icon"      file_name="toolbar_icons/mini_map.png" preload="true" />
-  <texture name="Command_Move_Icon"         file_name="toolbar_icons/move.png" preload="true" />
-  <texture name="Command_People_Icon"       file_name="toolbar_icons/people.png" preload="true" />
-  <texture name="Command_Places_Icon"       file_name="toolbar_icons/places.png" preload="true" />
-  <texture name="Command_Preferences_Icon"  file_name="toolbar_icons/preferences.png" preload="true" />
-  <texture name="Command_Profile_Icon"      file_name="toolbar_icons/profile.png" preload="true" />
-  <texture name="Command_Search_Icon"       file_name="toolbar_icons/search.png" preload="true" />
-  <texture name="Command_Snapshot_Icon"     file_name="toolbar_icons/snapshot.png" preload="true" />
-  <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="Command_Gestures_Icon"     file_name="toolbar_icons/gestures.png"     preload="true" />
+  <texture name="Command_HowTo_Icon"        file_name="toolbar_icons/howto.png"        preload="true" />
+  <texture name="Command_Inventory_Icon"    file_name="toolbar_icons/inventory.png"    preload="true" />
+  <texture name="Command_Map_Icon"          file_name="toolbar_icons/map.png"          preload="true" />
+  <texture name="Command_Marketplace_Icon"  file_name="toolbar_icons/marketplace.png"  preload="true" />
+  <texture name="Command_MiniMap_Icon"      file_name="toolbar_icons/mini_map.png"     preload="true" />
+  <texture name="Command_Move_Icon"         file_name="toolbar_icons/move.png"         preload="true" />
+  <texture name="Command_People_Icon"       file_name="toolbar_icons/people.png"       preload="true" />
+  <texture name="Command_Picks_Icon"        file_name="toolbar_icons/picks.png"        preload="true" />
+  <texture name="Command_Places_Icon"       file_name="toolbar_icons/places.png"       preload="true" />
+  <texture name="Command_Preferences_Icon"  file_name="toolbar_icons/preferences.png"  preload="true" />
+  <texture name="Command_Profile_Icon"      file_name="toolbar_icons/profile.png"      preload="true" />
+  <texture name="Command_Search_Icon"       file_name="toolbar_icons/search.png"       preload="true" />
+  <texture name="Command_Snapshot_Icon"     file_name="toolbar_icons/snapshot.png"     preload="true" />
+  <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="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/picks.png b/indra/newview/skins/default/textures/toolbar_icons/picks.png
new file mode 100644
index 0000000000..4499bf562b
Binary files /dev/null and b/indra/newview/skins/default/textures/toolbar_icons/picks.png differ
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