From 94af8b77df5fd63cb30ee676a313897b90841672 Mon Sep 17 00:00:00 2001
From: Vadim Savchuk <vsavchuk@productengine.com>
Date: Mon, 6 Sep 2010 17:33:48 +0300
Subject: VWR-20696 ADDITIONAL FIX Added and made use of new dock/undock icons.

---
 .../textures/taskpanel/Sidebar_Icon_Dock_Foreground.png  | Bin 0 -> 2899 bytes
 .../textures/taskpanel/Sidebar_Icon_Dock_Press.png       | Bin 0 -> 2886 bytes
 .../taskpanel/Sidebar_Icon_Undock_Foreground.png         | Bin 0 -> 2896 bytes
 .../textures/taskpanel/Sidebar_Icon_Undock_Press.png     | Bin 0 -> 2920 bytes
 indra/newview/skins/default/textures/textures.xml        |   6 ++++++
 .../skins/default/xui/en/panel_side_tray_tab_caption.xml |  12 ++++++------
 6 files changed, 12 insertions(+), 6 deletions(-)
 create mode 100644 indra/newview/skins/default/textures/taskpanel/Sidebar_Icon_Dock_Foreground.png
 create mode 100644 indra/newview/skins/default/textures/taskpanel/Sidebar_Icon_Dock_Press.png
 create mode 100644 indra/newview/skins/default/textures/taskpanel/Sidebar_Icon_Undock_Foreground.png
 create mode 100644 indra/newview/skins/default/textures/taskpanel/Sidebar_Icon_Undock_Press.png

diff --git a/indra/newview/skins/default/textures/taskpanel/Sidebar_Icon_Dock_Foreground.png b/indra/newview/skins/default/textures/taskpanel/Sidebar_Icon_Dock_Foreground.png
new file mode 100644
index 0000000000..50c01062a5
Binary files /dev/null and b/indra/newview/skins/default/textures/taskpanel/Sidebar_Icon_Dock_Foreground.png differ
diff --git a/indra/newview/skins/default/textures/taskpanel/Sidebar_Icon_Dock_Press.png b/indra/newview/skins/default/textures/taskpanel/Sidebar_Icon_Dock_Press.png
new file mode 100644
index 0000000000..bf2065cd37
Binary files /dev/null and b/indra/newview/skins/default/textures/taskpanel/Sidebar_Icon_Dock_Press.png differ
diff --git a/indra/newview/skins/default/textures/taskpanel/Sidebar_Icon_Undock_Foreground.png b/indra/newview/skins/default/textures/taskpanel/Sidebar_Icon_Undock_Foreground.png
new file mode 100644
index 0000000000..8b48258142
Binary files /dev/null and b/indra/newview/skins/default/textures/taskpanel/Sidebar_Icon_Undock_Foreground.png differ
diff --git a/indra/newview/skins/default/textures/taskpanel/Sidebar_Icon_Undock_Press.png b/indra/newview/skins/default/textures/taskpanel/Sidebar_Icon_Undock_Press.png
new file mode 100644
index 0000000000..09efe779fe
Binary files /dev/null and b/indra/newview/skins/default/textures/taskpanel/Sidebar_Icon_Undock_Press.png differ
diff --git a/indra/newview/skins/default/textures/textures.xml b/indra/newview/skins/default/textures/textures.xml
index 082b37d80b..ce67cf0083 100644
--- a/indra/newview/skins/default/textures/textures.xml
+++ b/indra/newview/skins/default/textures/textures.xml
@@ -428,6 +428,12 @@ with the same filename but different name
   <texture name="SegmentedBtn_Right_Selected_Disabled" file_name="widgets/SegmentedBtn_Right_Selected_Disabled.png" preload="true" scale.left="4" scale.top="19" scale.right="22" scale.bottom="4" />
 
   <texture name="Shirt_Large" file_name="icons/Shirt_Large.png" preload="false" />
+
+  <texture name="Sidebar_Icon_Dock_Foreground" file_name="taskpanel/Sidebar_Icon_Dock_Foreground.png" preload="false" />
+  <texture name="Sidebar_Icon_Dock_Press" file_name="taskpanel/Sidebar_Icon_Dock_Press.png" preload="false" />
+  <texture name="Sidebar_Icon_Undock_Foreground" file_name="taskpanel/Sidebar_Icon_Undock_Foreground.png" preload="false" />
+  <texture name="Sidebar_Icon_Undock_Press" file_name="taskpanel/Sidebar_Icon_Undock_Press.png" preload="false" />
+
   <texture name="Shop" file_name="icons/Shop.png" preload="false" />
 
   <texture name="SkipBackward_Off" file_name="icons/SkipBackward_Off.png" preload="false" />
diff --git a/indra/newview/skins/default/xui/en/panel_side_tray_tab_caption.xml b/indra/newview/skins/default/xui/en/panel_side_tray_tab_caption.xml
index 58112306d8..557b04d281 100644
--- a/indra/newview/skins/default/xui/en/panel_side_tray_tab_caption.xml
+++ b/indra/newview/skins/default/xui/en/panel_side_tray_tab_caption.xml
@@ -22,9 +22,9 @@
      <button
      follows="right|top"
      height="16"
-     image_selected="tearoffbox.tga"
-     image_unselected="tearoffbox.tga"
-     image_disabled="tearoff_pressed.tga"
+     image_selected="Sidebar_Icon_Undock_Press"
+     image_unselected="Sidebar_Icon_Undock_Foreground"
+     image_disabled="Sidebar_Icon_Undock_Press"
      layout="topleft"
      name="undock"
      top="10"
@@ -34,9 +34,9 @@
      <button
      follows="right|top"
      height="16"
-     image_selected="Icon_Dock_Press"
-     image_unselected="Icon_Dock_Foreground"
-     image_disabled="Icon_Dock_Press"
+     image_selected="Sidebar_Icon_Dock_Press"
+     image_unselected="Sidebar_Icon_Dock_Foreground"
+     image_disabled="Sidebar_Icon_Dock_Press"
      layout="topleft"
      name="dock"
      top="10"
-- 
cgit v1.2.3