From b937096c4eb9580fbeea9573acd4736f46da04b8 Mon Sep 17 00:00:00 2001
From: "Tank@Tank_PC.ftrdhcpuser.net" <Tank@Tank_PC.ftrdhcpuser.net>
Date: Mon, 12 Sep 2011 23:57:49 -0700
Subject: Fix typo in textures.xml

---
 indra/newview/skins/default/textures/textures.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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

diff --git a/indra/newview/skins/default/textures/textures.xml b/indra/newview/skins/default/textures/textures.xml
index 799cd907dc..6360b8cb5a 100644
--- a/indra/newview/skins/default/textures/textures.xml
+++ b/indra/newview/skins/default/textures/textures.xml
@@ -119,7 +119,7 @@ with the same filename but different name
   <texture name="Checkbox_On" file_name="widgets/Checkbox_On.png" preload="true" />
   <texture name="Checkbox_On_Press" file_name="widgets/Checkbox_On_Press.png" preload="true" />
   <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="Check_Mark" file_name="icons/check_mark.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" />
-- 
cgit v1.2.3


From 412e29ed9d62e975a5290c6008558a739b88065d Mon Sep 17 00:00:00 2001
From: Leslie Linden <leslie@lindenlab.com>
Date: Wed, 21 Sep 2011 17:25:38 -0700
Subject: EXP-1205 PROGRESS -- As a User, I want a toybox which will contain
 all buttons that I can d&d into the toolbars EXP-1232 FIX -- Create class to
 load and hold all of the command meta data associated with FUI toolbar
 actions

* Added basic commands.xml file to define FUI-related toolbar actions.  For now
  a basic "avatar" and "places" button are defined.
* Added basic command manager to parse and hold strings that define potential
  toolbar command actions.
* Broke out a separate floater function as a placeholder for the 3-state toolbar
  floater toggling.
* LLUI::initClass now parses the new commands.xml file

Reviewed by Richard.
---
 indra/newview/skins/default/textures/textures.xml | 3 +++
 1 file changed, 3 insertions(+)

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

diff --git a/indra/newview/skins/default/textures/textures.xml b/indra/newview/skins/default/textures/textures.xml
index 4d83ec2902..598e39730c 100644
--- a/indra/newview/skins/default/textures/textures.xml
+++ b/indra/newview/skins/default/textures/textures.xml
@@ -125,6 +125,9 @@ 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_Avatar_Icon" file_name="icons/SL_Logo.png" preload="true" />
+  <texture name="Command_Places_Icon" file_name="icons/SL_Logo.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" />
   <texture name="ComboButton_UpSelected" file_name="widgets/ComboButton_UpSelected.png" preload="true" scale.left="2" scale.top="19" scale.right="18" scale.bottom="2" />
-- 
cgit v1.2.3


From 53a8e1299305a4acad83f52401679c86485fcf51 Mon Sep 17 00:00:00 2001
From: Leslie Linden <leslie@lindenlab.com>
Date: Fri, 23 Sep 2011 09:45:28 -0700
Subject: EXP-1205 PROGRESS -- As a User, I want a toybox which will contain
 all buttons that I can d&d into the toolbars EXP-1233 PROGRESS -- Populate
 the toybox floater window with all FUI toolbar buttons

* Added all documented FUI commands from the wiki, 20 in all, with text,
  tooltips and placeholder icons.
* Note current toolbar checked in toolbar code does not lay these commands out
  properly.
---
 indra/newview/skins/default/textures/textures.xml | 22 ++++++++++++++++++++--
 1 file changed, 20 insertions(+), 2 deletions(-)

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

diff --git a/indra/newview/skins/default/textures/textures.xml b/indra/newview/skins/default/textures/textures.xml
index 598e39730c..d68594097c 100644
--- a/indra/newview/skins/default/textures/textures.xml
+++ b/indra/newview/skins/default/textures/textures.xml
@@ -125,8 +125,26 @@ 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_Avatar_Icon" file_name="icons/SL_Logo.png" preload="true" />
-  <texture name="Command_Places_Icon" file_name="icons/SL_Logo.png" preload="true" />
+  <texture name="Command_Avatar_Icon"    file_name="icons/SL_Logo.png" preload="true" />
+  <texture name="Command_Build_Icon"     file_name="icons/SL_Logo.png" preload="true" />
+  <texture name="Command_Chat_Icon"      file_name="icons/SL_Logo.png" preload="true" />
+  <texture name="Command_Compass_Icon"   file_name="icons/SL_Logo.png" preload="true" />
+  <texture name="Command_Gestures_Icon"  file_name="icons/SL_Logo.png" preload="true" />
+  <texture name="Command_HowTo_Icon"     file_name="icons/SL_Logo.png" preload="true" />
+  <texture name="Command_Landmarks_Icon" file_name="icons/SL_Logo.png" preload="true" />
+  <texture name="Command_Map_Icon"       file_name="icons/SL_Logo.png" preload="true" />
+  <texture name="Command_Move_Icon"      file_name="icons/SL_Logo.png" preload="true" />
+  <texture name="Command_MyLand_Icon"    file_name="icons/SL_Logo.png" preload="true" />
+  <texture name="Command_MyStuff_Icon"   file_name="icons/SL_Logo.png" preload="true" />
+  <texture name="Command_People_Icon"    file_name="icons/SL_Logo.png" preload="true" />
+  <texture name="Command_Places_Icon"    file_name="icons/SL_Logo.png" preload="true" />
+  <texture name="Command_Search_Icon"    file_name="icons/SL_Logo.png" preload="true" />
+  <texture name="Command_Settings_Icon"  file_name="icons/SL_Logo.png" preload="true" />
+  <texture name="Command_Shop_Icon"      file_name="icons/SL_Logo.png" preload="true" />
+  <texture name="Command_Snapshot_Icon"  file_name="icons/SL_Logo.png" preload="true" />
+  <texture name="Command_Speak_Icon"     file_name="icons/SL_Logo.png" preload="true" />
+  <texture name="Command_Upload_Icon"    file_name="icons/SL_Logo.png" preload="true" />
+  <texture name="Command_View_Icon"      file_name="icons/SL_Logo.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" />
-- 
cgit v1.2.3


From 9da5a8d01085f13c0586bba4c818ed540335ae2e Mon Sep 17 00:00:00 2001
From: Leslie Linden <leslie@lindenlab.com>
Date: Mon, 26 Sep 2011 14:34:42 -0700
Subject: EXP-1205 PROGRESS -- As a User, I want a toybox which will contain
 all buttons that I can d&d into the toolbars EXP-1233 PROGRESS -- Populate
 the toybox floater window with all FUI toolbar buttons EXP-1235 FIX -- Make
 the toybox available through the context menus associated with the other
 toolbars EXP-1248 FIX -- Implement context menu on toolbars

* New commands are listed
* Toolbars can now be made read-only (as in the toybox) or editable (as in the others)
* Toolbars that are not read-only have a context menu that allows button type editing.

Reviewed by Richard.
---
 indra/newview/skins/default/textures/textures.xml | 1 +
 1 file changed, 1 insertion(+)

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

diff --git a/indra/newview/skins/default/textures/textures.xml b/indra/newview/skins/default/textures/textures.xml
index d68594097c..8f2194e652 100644
--- a/indra/newview/skins/default/textures/textures.xml
+++ b/indra/newview/skins/default/textures/textures.xml
@@ -133,6 +133,7 @@ with the same filename but different name
   <texture name="Command_HowTo_Icon"     file_name="icons/SL_Logo.png" preload="true" />
   <texture name="Command_Landmarks_Icon" file_name="icons/SL_Logo.png" preload="true" />
   <texture name="Command_Map_Icon"       file_name="icons/SL_Logo.png" preload="true" />
+  <texture name="Command_MiniMap_Icon"   file_name="icons/SL_Logo.png" preload="true" />
   <texture name="Command_Move_Icon"      file_name="icons/SL_Logo.png" preload="true" />
   <texture name="Command_MyLand_Icon"    file_name="icons/SL_Logo.png" preload="true" />
   <texture name="Command_MyStuff_Icon"   file_name="icons/SL_Logo.png" preload="true" />
-- 
cgit v1.2.3


From f56bf69dfed63d8b7d5d8994c0c3cafced803a0f Mon Sep 17 00:00:00 2001
From: Richard Nelson <richard@lindenlab.com>
Date: Mon, 26 Sep 2011 19:48:17 -0700
Subject: initial support for switching between icons only and icons + text

---
 indra/newview/skins/default/textures/textures.xml | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

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

diff --git a/indra/newview/skins/default/textures/textures.xml b/indra/newview/skins/default/textures/textures.xml
index 8f2194e652..be68c2873e 100644
--- a/indra/newview/skins/default/textures/textures.xml
+++ b/indra/newview/skins/default/textures/textures.xml
@@ -759,4 +759,27 @@ with the same filename but different name
   <texture name="Yellow_Gradient" file_name="windows/yellow_gradient.png"/>
   <texture name="Popup_Caution" file_name="icons/pop_up_caution.png"/>
   <texture name="Camera_Drag_Dot" file_name="world/CameraDragDot.png"/>
+
+  <texture name="Command_Avatar_Icon" file_name="taskpanel/TabIcon_Home_Off.png"/>
+  <texture name="Command_Build_Icon" file_name="taskpanel/TabIcon_Home_Off.png"/>
+  <texture name="Command_Chat_Icon" file_name="taskpanel/TabIcon_Home_Off.png"/>
+  <texture name="Command_Compass_Icon" file_name="taskpanel/TabIcon_Home_Off.png"/>
+  <texture name="Command_Gestures_Icon" file_name="taskpanel/TabIcon_Home_Off.png"/>
+  <texture name="Command_HowTo_Icon" file_name="taskpanel/TabIcon_Home_Off.png"/>
+  <texture name="Command_Landmarks_Icon" file_name="taskpanel/TabIcon_Home_Off.png"/>
+  <texture name="Command_Map_Icon" file_name="taskpanel/TabIcon_Home_Off.png"/>
+  <texture name="Command_MiniMap_Icon" file_name="taskpanel/TabIcon_Home_Off.png"/>
+  <texture name="Command_Move_Icon" file_name="taskpanel/TabIcon_Home_Off.png"/>
+  <texture name="Command_MyLand_Icon" file_name="taskpanel/TabIcon_Home_Off.png"/>
+  <texture name="Command_MyStuff_Icon" file_name="taskpanel/TabIcon_Home_Off.png"/>
+  <texture name="Command_People_Icon" file_name="taskpanel/TabIcon_Home_Off.png"/>
+  <texture name="Command_Places_Icon" file_name="taskpanel/TabIcon_Home_Off.png"/>
+  <texture name="Command_Search_Icon" file_name="taskpanel/TabIcon_Home_Off.png"/>
+  <texture name="Command_Settings_Icon" file_name="taskpanel/TabIcon_Home_Off.png"/>
+  <texture name="Command_Shop_Icon" file_name="taskpanel/TabIcon_Home_Off.png"/>
+  <texture name="Command_Snapshot_Icon" file_name="taskpanel/TabIcon_Home_Off.png"/>
+  <texture name="Command_Speak_Icon" file_name="taskpanel/TabIcon_Home_Off.png"/>
+  <texture name="Command_Upload_Icon" file_name="taskpanel/TabIcon_Home_Off.png"/>
+  <texture name="Command_View_Icon" file_name="taskpanel/TabIcon_Home_Off.png"/>
+
 </textures>
-- 
cgit v1.2.3


From 66e21e0330b2f66b986a1ed76873af9752dcf2e1 Mon Sep 17 00:00:00 2001
From: Leslie Linden <leslie@lindenlab.com>
Date: Thu, 29 Sep 2011 17:03:36 -0700
Subject:  * Added latest set of FUI buttons and labels according to the wiki 
 * Hooked up commands to their respective floaters

---
 indra/newview/skins/default/textures/textures.xml | 44 ++++++++++++-----------
 1 file changed, 23 insertions(+), 21 deletions(-)

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

diff --git a/indra/newview/skins/default/textures/textures.xml b/indra/newview/skins/default/textures/textures.xml
index be68c2873e..57ce7fe57a 100644
--- a/indra/newview/skins/default/textures/textures.xml
+++ b/indra/newview/skins/default/textures/textures.xml
@@ -125,27 +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_Avatar_Icon"    file_name="icons/SL_Logo.png" preload="true" />
-  <texture name="Command_Build_Icon"     file_name="icons/SL_Logo.png" preload="true" />
-  <texture name="Command_Chat_Icon"      file_name="icons/SL_Logo.png" preload="true" />
-  <texture name="Command_Compass_Icon"   file_name="icons/SL_Logo.png" preload="true" />
-  <texture name="Command_Gestures_Icon"  file_name="icons/SL_Logo.png" preload="true" />
-  <texture name="Command_HowTo_Icon"     file_name="icons/SL_Logo.png" preload="true" />
-  <texture name="Command_Landmarks_Icon" file_name="icons/SL_Logo.png" preload="true" />
-  <texture name="Command_Map_Icon"       file_name="icons/SL_Logo.png" preload="true" />
-  <texture name="Command_MiniMap_Icon"   file_name="icons/SL_Logo.png" preload="true" />
-  <texture name="Command_Move_Icon"      file_name="icons/SL_Logo.png" preload="true" />
-  <texture name="Command_MyLand_Icon"    file_name="icons/SL_Logo.png" preload="true" />
-  <texture name="Command_MyStuff_Icon"   file_name="icons/SL_Logo.png" preload="true" />
-  <texture name="Command_People_Icon"    file_name="icons/SL_Logo.png" preload="true" />
-  <texture name="Command_Places_Icon"    file_name="icons/SL_Logo.png" preload="true" />
-  <texture name="Command_Search_Icon"    file_name="icons/SL_Logo.png" preload="true" />
-  <texture name="Command_Settings_Icon"  file_name="icons/SL_Logo.png" preload="true" />
-  <texture name="Command_Shop_Icon"      file_name="icons/SL_Logo.png" preload="true" />
-  <texture name="Command_Snapshot_Icon"  file_name="icons/SL_Logo.png" preload="true" />
-  <texture name="Command_Speak_Icon"     file_name="icons/SL_Logo.png" preload="true" />
-  <texture name="Command_Upload_Icon"    file_name="icons/SL_Logo.png" preload="true" />
-  <texture name="Command_View_Icon"      file_name="icons/SL_Logo.png" preload="true" />
+  <texture name="Command_AboutLand_Icon"    file_name="icons/SL_Logo.png" preload="true" />
+  <texture name="Command_Appearance_Icon"   file_name="icons/SL_Logo.png" preload="true" />
+  <texture name="Command_Avatar_Icon"       file_name="icons/SL_Logo.png" preload="true" />
+  <texture name="Command_Build_Icon"        file_name="icons/SL_Logo.png" preload="true" />
+  <texture name="Command_Chat_Icon"         file_name="icons/SL_Logo.png" preload="true" />
+  <texture name="Command_Compass_Icon"      file_name="icons/SL_Logo.png" preload="true" />
+  <texture name="Command_Destinations_Icon" file_name="icons/SL_Logo.png" preload="true" />
+  <texture name="Command_Gestures_Icon"     file_name="icons/SL_Logo.png" preload="true" />
+  <texture name="Command_HowTo_Icon"        file_name="icons/SL_Logo.png" preload="true" />
+  <texture name="Command_Inventory_Icon"    file_name="icons/SL_Logo.png" preload="true" />
+  <texture name="Command_Map_Icon"          file_name="icons/SL_Logo.png" preload="true" />
+  <texture name="Command_Marketplace_Icon"  file_name="icons/SL_Logo.png" preload="true" />
+  <texture name="Command_MiniMap_Icon"      file_name="icons/SL_Logo.png" preload="true" />
+  <texture name="Command_Move_Icon"         file_name="icons/SL_Logo.png" preload="true" />
+  <texture name="Command_People_Icon"       file_name="icons/SL_Logo.png" preload="true" />
+  <texture name="Command_Places_Icon"       file_name="icons/SL_Logo.png" preload="true" />
+  <texture name="Command_Preferences_Icon"  file_name="icons/SL_Logo.png" preload="true" />
+  <texture name="Command_Profile_Icon"      file_name="icons/SL_Logo.png" preload="true" />
+  <texture name="Command_Search_Icon"       file_name="icons/SL_Logo.png" preload="true" />
+  <texture name="Command_Snapshot_Icon"     file_name="icons/SL_Logo.png" preload="true" />
+  <texture name="Command_Speak_Icon"        file_name="icons/SL_Logo.png" preload="true" />
+  <texture name="Command_View_Icon"         file_name="icons/SL_Logo.png" preload="true" />
+  <texture name="Command_Voice_Icon"        file_name="icons/SL_Logo.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" />
-- 
cgit v1.2.3


From ccd619013d851b5a63976205ea06002e92d7f468 Mon Sep 17 00:00:00 2001
From: Leslie Linden <leslie@lindenlab.com>
Date: Fri, 30 Sep 2011 13:37:03 -0700
Subject: Found and removed duplicate command icon definitions.

---
 indra/newview/skins/default/textures/textures.xml | 68 ++++++++---------------
 1 file changed, 23 insertions(+), 45 deletions(-)

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

diff --git a/indra/newview/skins/default/textures/textures.xml b/indra/newview/skins/default/textures/textures.xml
index 57ce7fe57a..4462fb792f 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="icons/SL_Logo.png" preload="true" />
-  <texture name="Command_Appearance_Icon"   file_name="icons/SL_Logo.png" preload="true" />
-  <texture name="Command_Avatar_Icon"       file_name="icons/SL_Logo.png" preload="true" />
-  <texture name="Command_Build_Icon"        file_name="icons/SL_Logo.png" preload="true" />
-  <texture name="Command_Chat_Icon"         file_name="icons/SL_Logo.png" preload="true" />
-  <texture name="Command_Compass_Icon"      file_name="icons/SL_Logo.png" preload="true" />
-  <texture name="Command_Destinations_Icon" file_name="icons/SL_Logo.png" preload="true" />
-  <texture name="Command_Gestures_Icon"     file_name="icons/SL_Logo.png" preload="true" />
-  <texture name="Command_HowTo_Icon"        file_name="icons/SL_Logo.png" preload="true" />
-  <texture name="Command_Inventory_Icon"    file_name="icons/SL_Logo.png" preload="true" />
-  <texture name="Command_Map_Icon"          file_name="icons/SL_Logo.png" preload="true" />
-  <texture name="Command_Marketplace_Icon"  file_name="icons/SL_Logo.png" preload="true" />
-  <texture name="Command_MiniMap_Icon"      file_name="icons/SL_Logo.png" preload="true" />
-  <texture name="Command_Move_Icon"         file_name="icons/SL_Logo.png" preload="true" />
-  <texture name="Command_People_Icon"       file_name="icons/SL_Logo.png" preload="true" />
-  <texture name="Command_Places_Icon"       file_name="icons/SL_Logo.png" preload="true" />
-  <texture name="Command_Preferences_Icon"  file_name="icons/SL_Logo.png" preload="true" />
-  <texture name="Command_Profile_Icon"      file_name="icons/SL_Logo.png" preload="true" />
-  <texture name="Command_Search_Icon"       file_name="icons/SL_Logo.png" preload="true" />
-  <texture name="Command_Snapshot_Icon"     file_name="icons/SL_Logo.png" preload="true" />
-  <texture name="Command_Speak_Icon"        file_name="icons/SL_Logo.png" preload="true" />
-  <texture name="Command_View_Icon"         file_name="icons/SL_Logo.png" preload="true" />
-  <texture name="Command_Voice_Icon"        file_name="icons/SL_Logo.png" 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="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" />
@@ -762,26 +762,4 @@ with the same filename but different name
   <texture name="Popup_Caution" file_name="icons/pop_up_caution.png"/>
   <texture name="Camera_Drag_Dot" file_name="world/CameraDragDot.png"/>
 
-  <texture name="Command_Avatar_Icon" file_name="taskpanel/TabIcon_Home_Off.png"/>
-  <texture name="Command_Build_Icon" file_name="taskpanel/TabIcon_Home_Off.png"/>
-  <texture name="Command_Chat_Icon" file_name="taskpanel/TabIcon_Home_Off.png"/>
-  <texture name="Command_Compass_Icon" file_name="taskpanel/TabIcon_Home_Off.png"/>
-  <texture name="Command_Gestures_Icon" file_name="taskpanel/TabIcon_Home_Off.png"/>
-  <texture name="Command_HowTo_Icon" file_name="taskpanel/TabIcon_Home_Off.png"/>
-  <texture name="Command_Landmarks_Icon" file_name="taskpanel/TabIcon_Home_Off.png"/>
-  <texture name="Command_Map_Icon" file_name="taskpanel/TabIcon_Home_Off.png"/>
-  <texture name="Command_MiniMap_Icon" file_name="taskpanel/TabIcon_Home_Off.png"/>
-  <texture name="Command_Move_Icon" file_name="taskpanel/TabIcon_Home_Off.png"/>
-  <texture name="Command_MyLand_Icon" file_name="taskpanel/TabIcon_Home_Off.png"/>
-  <texture name="Command_MyStuff_Icon" file_name="taskpanel/TabIcon_Home_Off.png"/>
-  <texture name="Command_People_Icon" file_name="taskpanel/TabIcon_Home_Off.png"/>
-  <texture name="Command_Places_Icon" file_name="taskpanel/TabIcon_Home_Off.png"/>
-  <texture name="Command_Search_Icon" file_name="taskpanel/TabIcon_Home_Off.png"/>
-  <texture name="Command_Settings_Icon" file_name="taskpanel/TabIcon_Home_Off.png"/>
-  <texture name="Command_Shop_Icon" file_name="taskpanel/TabIcon_Home_Off.png"/>
-  <texture name="Command_Snapshot_Icon" file_name="taskpanel/TabIcon_Home_Off.png"/>
-  <texture name="Command_Speak_Icon" file_name="taskpanel/TabIcon_Home_Off.png"/>
-  <texture name="Command_Upload_Icon" file_name="taskpanel/TabIcon_Home_Off.png"/>
-  <texture name="Command_View_Icon" file_name="taskpanel/TabIcon_Home_Off.png"/>
-
 </textures>
-- 
cgit v1.2.3


From 63a8fce12b1e1c0d40d97e2f029776fed6e300fb Mon Sep 17 00:00:00 2001
From: Richard Nelson <richard@lindenlab.com>
Date: Fri, 30 Sep 2011 18:51:17 -0700
Subject: made toolbars conform to visual specs added ability to specify clip
 rects in textures.xml

---
 indra/newview/skins/default/textures/textures.xml | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

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

diff --git a/indra/newview/skins/default/textures/textures.xml b/indra/newview/skins/default/textures/textures.xml
index 4462fb792f..68773947ec 100644
--- a/indra/newview/skins/default/textures/textures.xml
+++ b/indra/newview/skins/default/textures/textures.xml
@@ -473,7 +473,11 @@ with the same filename but different name
 
   <texture name="Resize_Corner" file_name="windows/Resize_Corner.png" preload="true" />
 
-  <texture name="Rounded_Rect"	file_name="Rounded_Rect.png" preload="true" scale.left="6" scale.top="24" scale.right="58" scale.bottom="6" />
+  <texture name="Rounded_Rect"	file_name="Rounded_Rect.png" preload="true" scale.left="6" scale.top="26" scale.right="58" scale.bottom="6" />
+  <texture name="Rounded_Rect_Top"	file_name="Rounded_Rect.png" preload="true" scale.left="6" scale.top="8" scale.right="58" scale.bottom="0" clip.left="0" clip.right="64" clip.bottom="16" clip.top="32" />
+  <texture name="Rounded_Rect_Bottom"	file_name="Rounded_Rect.png" preload="true" scale.left="6" scale.top="16" scale.right="58" scale.bottom="8" clip.left="0" clip.right="64" clip.bottom="0" clip.top="16"  />
+  <texture name="Rounded_Rect_Left"	file_name="Rounded_Rect.png" preload="true" scale.left="6" scale.top="26" scale.right="32" scale.bottom="6" clip.left="0" clip.right="32" clip.bottom="0" clip.top="32" />
+  <texture name="Rounded_Rect_Right"	file_name="Rounded_Rect.png" preload="true" scale.left="0" scale.top="26" scale.right="26" scale.bottom="6" clip.left="32" clip.right="64" clip.bottom="0" clip.top="32" />
   <texture name="Rounded_Square"	file_name="rounded_square.j2c" preload="true" scale.left="16" scale.top="16" scale.right="112" scale.bottom="16" />
   <texture name="Row_Selection" file_name="navbar/Row_Selection.png" preload="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/default/textures')

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 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
 2 files changed, 23 insertions(+), 22 deletions(-)
 create mode 100644 indra/newview/skins/default/textures/toolbar_icons/picks.png

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

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
-- 
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 +++
 .../skins/default/textures/toolbar_icons/caret_bottom.png | Bin 0 -> 139 bytes
 .../skins/default/textures/toolbar_icons/caret_left.png   | Bin 0 -> 893 bytes
 .../skins/default/textures/toolbar_icons/caret_right.png  | Bin 0 -> 892 bytes
 4 files changed, 3 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/default/textures')

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
-- 
cgit v1.2.3


From 0620e6a79149e455744131703e8bdb74864b69be Mon Sep 17 00:00:00 2001
From: Leslie Linden <leslie@lindenlab.com>
Date: Tue, 11 Oct 2011 09:10:08 -0700
Subject: New picks icon

---
 .../skins/default/textures/toolbar_icons/picks.png    | Bin 1368 -> 1396 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

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

diff --git a/indra/newview/skins/default/textures/toolbar_icons/picks.png b/indra/newview/skins/default/textures/toolbar_icons/picks.png
index 4499bf562b..befda04b42 100644
Binary files a/indra/newview/skins/default/textures/toolbar_icons/picks.png and b/indra/newview/skins/default/textures/toolbar_icons/picks.png differ
-- 
cgit v1.2.3


From 3596c0f7e139724f31258ffb96157146aeba77b1 Mon Sep 17 00:00:00 2001
From: Merov Linden <merov@lindenlab.com>
Date: Tue, 11 Oct 2011 15:06:16 -0700
Subject: EXP-1300 : Implemented carets for DaD. Works with small bugs but OK
 for demo. Still in need of some cleanup

---
 .../default/textures/toolbar_icons/caret_bottom.png     | Bin 139 -> 169 bytes
 .../skins/default/textures/toolbar_icons/caret_left.png | Bin 893 -> 913 bytes
 .../default/textures/toolbar_icons/caret_right.png      | Bin 892 -> 911 bytes
 3 files changed, 0 insertions(+), 0 deletions(-)

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

diff --git a/indra/newview/skins/default/textures/toolbar_icons/caret_bottom.png b/indra/newview/skins/default/textures/toolbar_icons/caret_bottom.png
index 82f58b22b9..d506cda5c9 100644
Binary files a/indra/newview/skins/default/textures/toolbar_icons/caret_bottom.png 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
index 75eecc84ed..b1284aaf79 100644
Binary files a/indra/newview/skins/default/textures/toolbar_icons/caret_left.png 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
index 677459ae1c..bf6a4ed66c 100644
Binary files a/indra/newview/skins/default/textures/toolbar_icons/caret_right.png and b/indra/newview/skins/default/textures/toolbar_icons/caret_right.png differ
-- 
cgit v1.2.3


From 3c06bb26b0fc4204945020c37f00dbdf0ff9338b Mon Sep 17 00:00:00 2001
From: Leslie Linden <leslie@lindenlab.com>
Date: Tue, 11 Oct 2011 17:19:14 -0700
Subject: New icons with 10% more opacity

---
 .../skins/default/textures/toolbar_icons/move.png     | Bin 1322 -> 1328 bytes
 .../default/textures/toolbar_icons/nearbyvoice.png    | Bin 1280 -> 3160 bytes
 2 files changed, 0 insertions(+), 0 deletions(-)

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

diff --git a/indra/newview/skins/default/textures/toolbar_icons/move.png b/indra/newview/skins/default/textures/toolbar_icons/move.png
index 5854110782..5c2ced7375 100644
Binary files a/indra/newview/skins/default/textures/toolbar_icons/move.png 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
index 5bdcb22aa5..46e299cb94 100644
Binary files a/indra/newview/skins/default/textures/toolbar_icons/nearbyvoice.png and b/indra/newview/skins/default/textures/toolbar_icons/nearbyvoice.png differ
-- 
cgit v1.2.3


From 23a2a77369b9f4b4fb5e606dc962e5838fb44503 Mon Sep 17 00:00:00 2001
From: Richard Nelson <richard@lindenlab.com>
Date: Wed, 12 Oct 2011 15:39:40 -0700
Subject: added separator above navigation bar

---
 .../newview/skins/default/textures/navbar/separator.png  | Bin 0 -> 2826 bytes
 indra/newview/skins/default/textures/textures.xml        |   2 +-
 2 files changed, 1 insertion(+), 1 deletion(-)
 create mode 100644 indra/newview/skins/default/textures/navbar/separator.png

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

diff --git a/indra/newview/skins/default/textures/navbar/separator.png b/indra/newview/skins/default/textures/navbar/separator.png
new file mode 100644
index 0000000000..b93e5791a7
Binary files /dev/null and b/indra/newview/skins/default/textures/navbar/separator.png differ
diff --git a/indra/newview/skins/default/textures/textures.xml b/indra/newview/skins/default/textures/textures.xml
index 27577d42ea..4f34352516 100644
--- a/indra/newview/skins/default/textures/textures.xml
+++ b/indra/newview/skins/default/textures/textures.xml
@@ -769,5 +769,5 @@ with the same filename but different name
   <texture name="Yellow_Gradient" file_name="windows/yellow_gradient.png"/>
   <texture name="Popup_Caution" file_name="icons/pop_up_caution.png"/>
   <texture name="Camera_Drag_Dot" file_name="world/CameraDragDot.png"/>
-
+  <texture name="NavBar Separator" file_name="navbar/separator.png"/>
 </textures>
-- 
cgit v1.2.3


From aa1f0215c764fa346625ace43c467a0e0f803057 Mon Sep 17 00:00:00 2001
From: Merov Linden <merov@lindenlab.com>
Date: Wed, 12 Oct 2011 18:01:50 -0700
Subject: EXP-1331 : Implement new longer caret and make it work on multi lines
 or columns of tools. EXP-1304 : handle only tools in DaD on toolbars

---
 indra/newview/skins/default/textures/textures.xml       |   6 +++---
 .../default/textures/toolbar_icons/caret_bottom.png     | Bin 169 -> 195 bytes
 .../skins/default/textures/toolbar_icons/caret_left.png | Bin 913 -> 948 bytes
 .../default/textures/toolbar_icons/caret_right.png      | Bin 911 -> 949 bytes
 4 files changed, 3 insertions(+), 3 deletions(-)

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

diff --git a/indra/newview/skins/default/textures/textures.xml b/indra/newview/skins/default/textures/textures.xml
index 27577d42ea..c221f683c2 100644
--- a/indra/newview/skins/default/textures/textures.xml
+++ b/indra/newview/skins/default/textures/textures.xml
@@ -149,9 +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="Caret_Bottom_Icon"         file_name="toolbar_icons/caret_bottom.png" preload="true" scale.left="1" scale.top="23" scale.right="15" scale.bottom="1" />
+  <texture name="Caret_Right_Icon"          file_name="toolbar_icons/caret_right.png"  preload="true" scale.left="5" scale.top="15" scale.right="28" scale.bottom="1" />
+  <texture name="Caret_Left_Icon"           file_name="toolbar_icons/caret_left.png"   preload="true" scale.left="1" scale.top="15" scale.right="23" scale.bottom="1" />
 
   <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
index d506cda5c9..5f6a01eaa1 100644
Binary files a/indra/newview/skins/default/textures/toolbar_icons/caret_bottom.png 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
index b1284aaf79..0b8090314c 100644
Binary files a/indra/newview/skins/default/textures/toolbar_icons/caret_left.png 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
index bf6a4ed66c..044751560f 100644
Binary files a/indra/newview/skins/default/textures/toolbar_icons/caret_right.png and b/indra/newview/skins/default/textures/toolbar_icons/caret_right.png differ
-- 
cgit v1.2.3


From c054f1faed8f87f7c6dfb83c2a13ae3cae97ec89 Mon Sep 17 00:00:00 2001
From: Leslie Linden <leslie@lindenlab.com>
Date: Thu, 13 Oct 2011 16:48:59 -0700
Subject: * Hooked up build FUI toolbar button * Added Shop button to status
 bar * Changed "Inventory..." menu item to go to same window as toolbar
 inventory button

---
 indra/newview/skins/default/textures/textures.xml        |   1 +
 .../skins/default/textures/toolbar_icons/mini_cart.png   | Bin 0 -> 2987 bytes
 2 files changed, 1 insertion(+)
 create mode 100644 indra/newview/skins/default/textures/toolbar_icons/mini_cart.png

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

diff --git a/indra/newview/skins/default/textures/textures.xml b/indra/newview/skins/default/textures/textures.xml
index 25f1903131..ab1a8f0990 100644
--- a/indra/newview/skins/default/textures/textures.xml
+++ b/indra/newview/skins/default/textures/textures.xml
@@ -137,6 +137,7 @@ with the same filename but different name
   <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_MiniCart_Icon"     file_name="toolbar_icons/mini_cart.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" />
diff --git a/indra/newview/skins/default/textures/toolbar_icons/mini_cart.png b/indra/newview/skins/default/textures/toolbar_icons/mini_cart.png
new file mode 100644
index 0000000000..9fcf46794d
Binary files /dev/null and b/indra/newview/skins/default/textures/toolbar_icons/mini_cart.png differ
-- 
cgit v1.2.3


From 667c241177b9a23c305816fafb4feb81b0a93ba0 Mon Sep 17 00:00:00 2001
From: Leslie Linden <leslie@lindenlab.com>
Date: Fri, 14 Oct 2011 10:31:00 -0700
Subject: * Changed "Buy L$" and "Shop" buttons to gray per design. * Removed
 "marketplace" button from toybox and default toolbar configuration

---
 indra/newview/skins/default/textures/textures.xml | 1 +
 1 file changed, 1 insertion(+)

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

diff --git a/indra/newview/skins/default/textures/textures.xml b/indra/newview/skins/default/textures/textures.xml
index ab1a8f0990..53a5de0189 100644
--- a/indra/newview/skins/default/textures/textures.xml
+++ b/indra/newview/skins/default/textures/textures.xml
@@ -461,6 +461,7 @@ with the same filename but different name
   <texture name="PushButton_Off" file_name="widgets/PushButton_Off.png" preload="true" scale.left="4" scale.top="19" scale.right="28" scale.bottom="4" />
   <texture name="PushButton_On" file_name="widgets/PushButton_On.png" preload="true" scale.left="4" scale.top="19" scale.right="28" scale.bottom="4" />
   <texture name="PushButton_On_Selected" file_name="widgets/PushButton_On_Selected.png" preload="true" scale.left="4" scale.top="19" scale.right="28" scale.bottom="4" />
+  <texture name="PushButton_Over" file_name="widgets/PushButton_Over.png" preload="true" scale.left="4" scale.top="19" scale.right="28" scale.bottom="4" />
   <texture name="PushButton_Press" file_name="widgets/PushButton_Press.png" preload="true" scale.left="4" scale.top="19" scale.right="28" scale.bottom="4" />
   <texture name="PushButton_Selected" file_name="widgets/PushButton_Selected.png" preload="true" scale.left="4" scale.top="19" scale.right="28" scale.bottom="4" />
   <texture name="PushButton_Selected_Press" file_name="widgets/PushButton_Selected_Press.png" preload="true" scale.left="4" scale.top="19" scale.right="28" scale.bottom="4" />
-- 
cgit v1.2.3


From 93b6be6288036681c583e23be3b43ed23732352c Mon Sep 17 00:00:00 2001
From: Leslie Linden <leslie@lindenlab.com>
Date: Fri, 14 Oct 2011 14:46:21 -0700
Subject: New icon love for FUI

---
 .../skins/default/textures/toolbar_icons/mini_map.png | Bin 1645 -> 1766 bytes
 .../default/textures/toolbar_icons/nearbyvoice.png    | Bin 3160 -> 1460 bytes
 .../default/textures/toolbar_icons/preferences.png    | Bin 1427 -> 1587 bytes
 .../skins/default/textures/toolbar_icons/view.png     | Bin 1618 -> 1487 bytes
 4 files changed, 0 insertions(+), 0 deletions(-)

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

diff --git a/indra/newview/skins/default/textures/toolbar_icons/mini_map.png b/indra/newview/skins/default/textures/toolbar_icons/mini_map.png
index b66af223bb..ab0a654056 100644
Binary files a/indra/newview/skins/default/textures/toolbar_icons/mini_map.png and b/indra/newview/skins/default/textures/toolbar_icons/mini_map.png differ
diff --git a/indra/newview/skins/default/textures/toolbar_icons/nearbyvoice.png b/indra/newview/skins/default/textures/toolbar_icons/nearbyvoice.png
index 46e299cb94..22d88af352 100644
Binary files a/indra/newview/skins/default/textures/toolbar_icons/nearbyvoice.png and b/indra/newview/skins/default/textures/toolbar_icons/nearbyvoice.png differ
diff --git a/indra/newview/skins/default/textures/toolbar_icons/preferences.png b/indra/newview/skins/default/textures/toolbar_icons/preferences.png
index df80d926b5..4ccd7b8ae1 100644
Binary files a/indra/newview/skins/default/textures/toolbar_icons/preferences.png and b/indra/newview/skins/default/textures/toolbar_icons/preferences.png differ
diff --git a/indra/newview/skins/default/textures/toolbar_icons/view.png b/indra/newview/skins/default/textures/toolbar_icons/view.png
index 5425af87e0..ddf0df7c26 100644
Binary files a/indra/newview/skins/default/textures/toolbar_icons/view.png and b/indra/newview/skins/default/textures/toolbar_icons/view.png differ
-- 
cgit v1.2.3


From 9f9734359e402d7c4077b98298411476750f0534 Mon Sep 17 00:00:00 2001
From: Leslie Linden <leslie@lindenlab.com>
Date: Fri, 14 Oct 2011 14:52:22 -0700
Subject: New nearbyvoice icon

---
 .../default/textures/toolbar_icons/nearbyvoice.png    | Bin 1460 -> 1479 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

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

diff --git a/indra/newview/skins/default/textures/toolbar_icons/nearbyvoice.png b/indra/newview/skins/default/textures/toolbar_icons/nearbyvoice.png
index 22d88af352..77a7cd5f44 100644
Binary files a/indra/newview/skins/default/textures/toolbar_icons/nearbyvoice.png and b/indra/newview/skins/default/textures/toolbar_icons/nearbyvoice.png differ
-- 
cgit v1.2.3