From 807fafa82bf1484002e2fae965be649d6322be9a Mon Sep 17 00:00:00 2001
From: Erica <erica@lindenlab.com>
Date: Thu, 7 Jan 2010 17:05:15 -0800
Subject: [PATCH] EXT-3799 Extreeeeeeeeme Navbar cleanup to match spec -
 favorites height, vertical and horizontal alignment, volume button art

---
 .../default/textures/navbar/NavBar_BG.png     | Bin 210 -> 195 bytes
 .../skins/default/textures/textures.xml       |   7 ++--
 .../default/xui/en/favorites_bar_button.xml   |   8 ++---
 .../default/xui/en/panel_navigation_bar.xml   |  30 ++++--------------
 .../skins/default/xui/en/panel_status_bar.xml |  22 +++++++------
 .../default/xui/en/widgets/location_input.xml |  20 ++++++------
 6 files changed, 34 insertions(+), 53 deletions(-)

diff --git a/indra/newview/skins/default/textures/navbar/NavBar_BG.png b/indra/newview/skins/default/textures/navbar/NavBar_BG.png
index 1df61751a88333c695b2a15affde9fdb15eb63b7..38eea783e6ab496ddf602d4bf61e186a4ab2a303 100644
GIT binary patch
delta 143
zcmcb_c$jg5IF}6v8v_G_$j%=RCMs%FrFyzJhE&{obNwK1g8>io0WrnW-jrZ7KXZm-
z9FKH<*7MifC_j?xE$(^7$btd>=zq9V{hci>Ek7ajrUDXpkY4{WYPD&>zP(n=@{DW@
YmydE3=iPc?544!U)78&qol`;+05MN4hX4Qo

delta 159
zcmX@ic!_a>I9D(S8v_HwTWQz)iHaKaC7v#hAr-gYTtCR!;K1X0FjjC|Z_e_vIVB6s
z6kTSp?>zr7-bne8T(7m;X9h+>!2ZRWRre0;EzeI#yQP2x9_0Ujv^6aILCyPDJT)v5
b3}>4-79LdWcV=MVVqoxe^>bP0l+XkKgKjZy

diff --git a/indra/newview/skins/default/textures/textures.xml b/indra/newview/skins/default/textures/textures.xml
index 2b9037397a..16ce77b6bf 100644
--- a/indra/newview/skins/default/textures/textures.xml
+++ b/indra/newview/skins/default/textures/textures.xml
@@ -222,7 +222,6 @@ with the same filename but different name
   <texture name="Inspector_Background" file_name="windows/Inspector_Background.png" preload="false"
            scale.left="4" scale.top="28" scale.right="60" scale.bottom="4" />
   <texture name="Inspector_Hover" file_name="windows/Inspector_Hover.png" preload="false" />
-  <texture name="Inspector_I" file_name="windows/Inspector_I.png" preload="false" />
 
   <texture name="Inv_Acessories" file_name="icons/Inv_Accessories.png" preload="false" />
   <texture name="Inv_Alpha" file_name="icons/Inv_Alpha.png" preload="false" />
@@ -306,8 +305,8 @@ with the same filename but different name
   <texture name="Movement_Up_Off" file_name="bottomtray/Movement_Up_Off.png" preload="false" />
   <texture name="Movement_Up_On" file_name="bottomtray/Movement_Up_On.png" preload="false" />
 
-  <texture name="NavBar_BG_NoFav" file_name="navbar/NavBar_BG_NoFav.png" preload="false" />
-  <texture name="NavBar_BG" file_name="navbar/NavBar_BG.png" preload="false" />
+  <texture name="NavBar_BG_NoFav" file_name="navbar/NavBar_BG_NoFav.png" preload="true" scale.left="1" scale.top="1" scale.right="0" scale.bottom="0" />
+  <texture name="NavBar_BG" file_name="navbar/NavBar_BG.png" preload="true" scale.left="1" scale.top="1" scale.right="0" scale.bottom="0" />
 
   <texture name="NearbyVoice_Lvl1" file_name="bottomtray/NearbyVoice_Lvl1.png" preload="false" />
   <texture name="NearbyVoice_Lvl2" file_name="bottomtray/NearbyVoice_Lvl2.png" preload="false" />
@@ -352,7 +351,7 @@ with the same filename but different name
 
  <texture name="Parcel_Build_Dark" file_name="icons/Parcel_Build_Dark.png" preload="false" />
  <texture name="Parcel_BuildNo_Dark" file_name="icons/Parcel_BuildNo_Dark.png" preload="false" />
- <texture name="Parcel_Damage_Dark" file_name="icons/Parcel_Damage_Dark.png" preload="false" />
+ <texture name="Parcel_Damage_Dark" file_name="icons/Parcel_Health_Dark.png" preload="false" />
  <texture name="Parcel_DamageNo_Dark" file_name="icons/Parcel_DamageNo_Dark.png" preload="false" />
  <texture name="Parcel_Evry_Dark" file_name="icons/Parcel_Evry_Dark.png" preload="false" />
  <texture name="Parcel_Exp_Dark" file_name="icons/Parcel_Exp_Dark.png" preload="false" />
diff --git a/indra/newview/skins/default/xui/en/favorites_bar_button.xml b/indra/newview/skins/default/xui/en/favorites_bar_button.xml
index dcf9847adb..dfb0695ec3 100644
--- a/indra/newview/skins/default/xui/en/favorites_bar_button.xml
+++ b/indra/newview/skins/default/xui/en/favorites_bar_button.xml
@@ -10,18 +10,16 @@
  image_disabled_selected="transparent.j2c"
  image_selected="transparent.j2c"
  image_unselected="transparent.j2c"
- image_hover_selected="Favorite_Link_Over"
- image_hover_unselected="Favorite_Link_Over"
  image_pressed="Favorite_Link_Over"
- image_pressed_selected="Favorite_Link_Over"
  hover_glow_amount="0.15"
  label_shadow="false"
  layout="topleft"
  left="0"
  name="favorites_bar_btn"
- pad_bottom="-1"
+ pad_bottom="1"
  pad_left="11"
- pad_right="7"
+ pad_right="9"
+ scale_image="true"
  tab_stop="false"
  top="0"
  use_ellipses="true"
diff --git a/indra/newview/skins/default/xui/en/panel_navigation_bar.xml b/indra/newview/skins/default/xui/en/panel_navigation_bar.xml
index 0f9b095d8c..e2884dbedc 100644
--- a/indra/newview/skins/default/xui/en/panel_navigation_bar.xml
+++ b/indra/newview/skins/default/xui/en/panel_navigation_bar.xml
@@ -29,12 +29,12 @@
 	 visible="false"
 	 left="0"
 	 top="0"
-	 height="60"
+	 height="50"
 	 width="600"/>
 	<panel
 	 background_visible="false"
 	 follows="left|top|right"
-	 top="5"
+	 top="3"
 	 height="23"
 	 layout="topleft"
 	 name="navigation_panel"
@@ -42,28 +42,17 @@
 	     <button
 	     follows="left|top"
 	     height="23"
-	     image_disabled="PushButton_Disabled"
-	     image_disabled_selected="PushButton_Disabled"
 	     image_overlay="Arrow_Left_Off"
-	     image_selected="PushButton_Selected"
-	     image_unselected="PushButton_Off"
-	     hover_glow_amount="0.15"
 	     layout="topleft"
 	     left="10"
 	     name="back_btn"
 	     tool_tip="Go back to previous location"
 	     top="3"
 	     width="31" />
-
 	    <button
 	     follows="left|top"
 	     height="23"
-	     image_disabled="PushButton_Disabled"
-	     image_disabled_selected="PushButton_Disabled"
 	     image_overlay="Arrow_Right_Off"
-	     image_selected="PushButton_Selected"
-	     image_unselected="PushButton_Off"
-	     hover_glow_amount="0.15"
 	     layout="topleft"
 	     left_pad="0"
 	     name="forward_btn"
@@ -73,12 +62,7 @@
 	    <button
 	     follows="left|top"
 	     height="23"
-	     image_disabled="PushButton_Disabled"
-	     image_disabled_selected="PushButton_Disabled"
 	     image_overlay="Home_Off"
-	     image_selected="PushButton_Selected"
-	     image_unselected="PushButton_Off"
-	     hover_glow_amount="0.15"
 	     layout="topleft"
 	     left_pad="7"
 	     name="home_btn"
@@ -146,7 +130,6 @@
           name="search_combo_editor"/>
         </search_combo_box>
 	</panel>
-
     <favorites_bar
      follows="left|right|top"
      font="SansSerifSmall"
@@ -154,16 +137,17 @@
      layout="topleft"
      left="0"
      name="favorite"
-     image_drag_indication="arrow_down.tga"
-   bottom="57"
+     image_drag_indication="Accordion_ArrowOpened_Off"
+   bottom="55"
    width="590">
     <chevron_button name=">>"
                      image_unselected="TabIcon_Close_Off"
                      image_selected="TabIcon_Close_Off"
                      tab_stop="false"
-                     follows="left|bottom" 
-                     tool_tip="Show more of My Favorites" 
+                     follows="left|bottom"
+                     tool_tip="Show more of My Favorites"
                      width="15"
+		     top="15"
                      height="15"/>
   </favorites_bar>
 </panel>
diff --git a/indra/newview/skins/default/xui/en/panel_status_bar.xml b/indra/newview/skins/default/xui/en/panel_status_bar.xml
index 3578c4326d..00f54feabd 100644
--- a/indra/newview/skins/default/xui/en/panel_status_bar.xml
+++ b/indra/newview/skins/default/xui/en/panel_status_bar.xml
@@ -3,7 +3,7 @@
  background_opaque="true"
  background_visible="true"
  bg_opaque_color="MouseGray"
- follows="all"
+ follows="top|right"
  height="19"
  layout="topleft"
  left="0"
@@ -44,15 +44,17 @@
      halign="right"
      follows="right|top"
      image_selected="BuyArrow_Over"
-     image_unselected="BuyArrow_Off"
+     image_unselected="BuyArrow_Over"
      image_pressed="BuyArrow_Press"
      height="16"
-     right="-120"
+     right="-128"
+     label_color="White"
+     label_shadow="false"
      name="buycurrency"
      pad_right="20px"
      tool_tip="My Balance: Click to buy more L$"
-     top="0"
-     width="90" />
+     top="3"
+     width="100" />
     <text
      type="string"
      font="SansSerifSmall"
@@ -62,25 +64,25 @@
      height="16"
      top="4"
      layout="topleft"
-     left_pad="-7"
+     left_pad="0"
      name="TimeText"
      text_color="TimeTextColor"
      tool_tip="Current time (Pacific)"
-     width="80">
+     width="85">
         12:00 AM
     </text>
     <button
      follows="right|bottom"
      height="16"
-     image_selected="Parcel_VoiceNo_Dark"
-     image_unselected="Parcel_Voice_Dark"
+     image_selected="AudioMute_Off"
+     image_pressed="Audio_Press"
+     image_unselected="Audio_Off"
      is_toggle="true"
      left_pad="18"
      top="1"
      name="volume_btn"
      tool_tip="Global Volume Control"
      width="16" />
-
     <text
      enabled="true"
      follows="right|bottom"
diff --git a/indra/newview/skins/default/xui/en/widgets/location_input.xml b/indra/newview/skins/default/xui/en/widgets/location_input.xml
index 1368c6826d..67bb7c1896 100644
--- a/indra/newview/skins/default/xui/en/widgets/location_input.xml
+++ b/indra/newview/skins/default/xui/en/widgets/location_input.xml
@@ -3,15 +3,12 @@
 *TODO: Replace hardcoded buttons width/height with getting this info from the button images.
        Currently that doesn't work because LLUIImage::getWidth/getHeight() return 1 for the images.
 -->
-
-
-
 <location_input font="SansSerifSmall"
                 add_landmark_image_enabled="Favorite_Star_Active"
                 add_landmark_image_disabled="Favorite_Star_Off"
                 add_landmark_image_hover="Favorite_Star_Over"
                 add_landmark_image_selected="Favorite_Star_Press"
-				add_landmark_hpad="12"
+		add_landmark_hpad="12"
                 icon_hpad="2"
                 allow_text_entry="true"
                 list_position="below"
@@ -26,8 +23,8 @@
     name="Place Information"
     width="16"
     height="16"
-    left="4" 
-    top="20" 
+    left="6"
+    top="20"
                           follows="left|top"
                           hover_glow_amount="0.15"
                           image_unselected="Info_Off"
@@ -55,7 +52,7 @@
     top="21"
     />
   <voice_icon
-    enabled="true" 
+    enabled="true"
     name="voice_icon"
     width="22"
     height="18"
@@ -97,11 +94,12 @@
     />
   <damage_icon
     name="damage_icon"
-    width="20"
-    height="16"
-    top="20"
+    width="14"
+    height="13"
+    top="22"
+    left="2"
     follows="right|top"
-    image_name="Parcel_Damage_Light"
+    image_name="Parcel_Damage_Dark"
     />
   <!-- Default text color is invisible on top of nav bar background -->
   <damage_text