DEV-35039 Viewer 2.0 Help System - Viewer Development

svn merge -r134800:134805 svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer2help-3

3 files changed, 3 insertions, 11 deletions

diff --git a/indra/newview/skins/default/textures/textures.xml b/indra/newview/skins/default/textures/textures.xml
index 46c294768d..66ea444c15 100644
--- a/indra/newview/skins/default/textures/textures.xml
+++ b/indra/newview/skins/default/textures/textures.xml
@@ -110,12 +110,10 @@
   <texture name="Home_Off" file_name="navbar/Home_Off.png" preload="false" />
   <texture name="Home_Press" file_name="navbar/Home_Press.png" preload="false" />
 
-  <texture name="Icon_Close_Background" file_name="windows/Icon_Close_Background.png" preload="true" />
   <texture name="Icon_Close_Foreground" file_name="windows/Icon_Close_Foreground.png" preload="true" />
   <texture name="Icon_Close_Press" file_name="windows/Icon_Close_Press.png" preload="true" />
   <texture name="Icon_Close_Toast" file_name="windows/Icon_Close_Toast.png" preload="true" />
 
-  <texture name="Icon_Dock_Background" file_name="windows/Icon_Dock_Background.png" preload="true" />
   <texture name="Icon_Dock_Foreground" file_name="windows/Icon_Dock_Foreground.png" preload="true" />
   <texture name="Icon_Dock_Press" file_name="windows/Icon_Dock_Press.png" preload="true" />
 
@@ -125,16 +123,16 @@
   <texture name="Icon_Gear_Foreground" file_name="windows/Icon_Gear_Foreground.png" preload="false" />
   <texture name="Icon_Gear_Press" file_name="windows/Icon_Gear_Press.png" preload="false" />
 
-  <texture name="Icon_Help_Background" file_name="windows/Icon_Help_Background.png" preload="false" />
   <texture name="Icon_Help_Foreground" file_name="windows/Icon_Help_Foreground.png" preload="false" />
   <texture name="Icon_Help_Press" file_name="windows/Icon_Help_Press.png" preload="false" />
   <texture name="Icon_Info" file_name="windows/Icon_Info.png" preload="false" />
 
-  <texture name="Icon_Minimize_Background" file_name="windows/Icon_Minimize_Background.png" preload="true" />
   <texture name="Icon_Minimize_Foreground" file_name="windows/Icon_Minimize_Foreground.png" preload="true" />
   <texture name="Icon_Minimize_Press" file_name="windows/Icon_Minimize_Press.png" preload="true" />
 
-  <texture name="Icon_Undock_Background" file_name="windows/Icon_Undock_Background.png" preload="false" />
+  <texture name="Icon_Restore_Foreground" file_name="windows/Icon_Restore_Foreground.png" preload="false" />
+  <texture name="Icon_Restore_Press" file_name="windows/Icon_Restore_Press.png" preload="false" />
+
   <texture name="Icon_Undock_Foreground" file_name="windows/Icon_Undock_Foreground.png" preload="false" />
   <texture name="Icon_Undock_Press" file_name="windows/Icon_Undock_Press.png" preload="false" />
 
@@ -442,8 +440,6 @@
   <texture name="cam_zoom_plus_in.tga" preload="false" />
   <texture name="cam_zoom_minus_in.tga" preload="false" />
 
-  <texture name="close_inactive_blue.tga" />
-  <texture name="closebox.tga" />
   <texture name="icn_clear_lineeditor.tga" />
 
   <texture name="icn_chatbar.tga" />
@@ -493,10 +489,6 @@
   <texture name="up_arrow.tga" file_name="up_arrow.png" />
   <texture name="down_arrow.tga" file_name="down_arrow.png" />
 
-  <texture name="restore_inactive.tga" />
-  <texture name="restore.tga" />
-  <texture name="restore_pressed.tga" />
-
   <texture name="tearoffbox.tga" />
   <texture name="tearoff_pressed.tga" />
 
diff --git a/indra/newview/skins/default/textures/windows/Icon_Restore_Foreground.png b/indra/newview/skins/default/textures/windows/Icon_Restore_Foreground.png
new file mode 100644
index 0000000000..1e753aaf1d
--- /dev/null
+++ b/indra/newview/skins/default/textures/windows/Icon_Restore_Foreground.png
diff --git a/indra/newview/skins/default/textures/windows/Icon_Restore_Press.png b/indra/newview/skins/default/textures/windows/Icon_Restore_Press.png
new file mode 100644
index 0000000000..be66b05230
--- /dev/null
+++ b/indra/newview/skins/default/textures/windows/Icon_Restore_Press.png