1 files changed, 31 insertions, 20 deletions

diff --git a/linden/indra/newview/skins/xui/en-us/panel_status_bar.xml b/linden/indra/newview/skins/xui/en-us/panel_status_bar.xml
index 9f39fd6..1def3fb 100644
--- a/linden/indra/newview/skins/xui/en-us/panel_status_bar.xml
+++ b/linden/indra/newview/skins/xui/en-us/panel_status_bar.xml
@@ -7,30 +7,30 @@
              bottom="-22" drop_shadow_visible="true" enabled="true"
              follows="left|right|bottom" font="SansSerifSmall" h_pad="0" halign="left"
              height="18" hover="true" left="561" mouse_opaque="true"
-             name="ParcelNameText"
+             name="ParcelNameText" text_color="ParcelTextColor" hover_color="ParcelHoverColor"
              tool_tip="Name of land parcel on which you are standing. Click for About Land."
              v_pad="2" width="1039">
                 parcel name goes here
         </text>
         <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-             bottom="-20" disabled_color="0 1 0 1" drop_shadow_visible="true"
+             bottom="-20" disabled_color="BalanceTextColor" drop_shadow_visible="true"
              enabled="true" follows="right|bottom" font="SansSerifSmall" h_pad="0"
              halign="right" height="18" left="-210" mouse_opaque="true"
-             name="BalanceText" text_color="0 1 0 1" tool_tip="Account Balance"
+             name="BalanceText" text_color="BalanceTextColor" tool_tip="Account Balance"
              v_pad="2" width="76">
                 Loading...
         </text>
-        <button bottom="-18" enabled="true" follows="right|bottom" font="SansSerif"
+        <button bottom="-17" enabled="true" follows="right|bottom" font="SansSerif"
              halign="center" height="16"
              image_selected="status_buy_currency_pressed.tga"
              image_unselected="status_buy_currency.tga" label="" label_selected=""
              left="-210" mouse_opaque="true" name="buycurrency" scale_image="true"
              tool_tip="Buy currency" width="16" />
         <text type="string" length="12" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-             bottom="-20" disabled_color="1 1 1 1" drop_shadow_visible="true"
+             bottom="-20" disabled_color="TimeTextColor" drop_shadow_visible="true"
              enabled="true" follows="right|bottom" font="SansSerifSmall" h_pad="0"
              halign="right" height="18" left="-300" mouse_opaque="true" name="TimeText"
-             text_color="1 1 1 1" tool_tip="Current Time (Pacific)" v_pad="2" width="80">
+             text_color="TimeTextColor" tool_tip="Current Time (Pacific)" v_pad="2" width="80">
                 12:00 AM
         </text>
         <string name="StatBarDaysOfWeek">
@@ -50,10 +50,10 @@
              mouse_opaque="true" name="health" scale_image="false" tool_tip="Health"
              visible="false" width="24" />
         <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-             bottom="-18" disabled_color="1 1 1 1" drop_shadow_visible="true"
+             bottom="-18" disabled_color="HealthTextColor" drop_shadow_visible="true"
              enabled="true" follows="rsight|bottom" font="SansSerifSmall" h_pad="0"
              halign="left" height="18" left="418" mouse_opaque="true" name="HealthText"
-             text_color="1 1 1 1" tool_tip="Health" v_pad="2" visible="false" width="31">
+             text_color="HealthTextColor" tool_tip="Health" v_pad="2" visible="false" width="31">
                 100%
         </text>
         <button bottom="-22" enabled="true" follows="right|bottom" font="SansSerif"
@@ -81,27 +81,38 @@
              image_unselected="status_no_voice.tga" label="" label_selected=""
              left="545" mouse_opaque="true" name="status_no_voice" scale_image="false"
              tool_tip="Voice not available here" visible="false" width="24" />
-        <button bottom="-18" enabled="true" follows="right|bottom" font="SansSerif"
+        <button bottom="-17" enabled="true" follows="right|bottom" font="SansSerif"
              halign="center" height="16" image_selected="status_buy_land_pressed.tga"
              image_unselected="status_buy_land.tga" label="" label_selected=""
-             left="569" mouse_opaque="true" name="buyland" scale_image="true"
+             left="576" mouse_opaque="true" name="buyland" scale_image="true"
              tool_tip="Buy this parcel" visible="false" width="16" />
-        <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom="-18"
+
+  <!-- Totally unsexy button hack to get a sexy bevel for sexy search bevel -brent -->
+  <button bottom="-17" height="16" left="-97" width="96" 
+          image_unselected="sm_rounded_corners_simple.tga"
+          image_selected="sm_rounded_corners_simple.tga"
+          image_hover_selected="sm_rounded_corners_simple.tga"
+          image_hover_unselected="sm_rounded_corners_simple.tga"
+          image_disabled_selected="sm_rounded_corners_simple.tga"
+          image_disabled="sm_rounded_corners_simple.tga"
+          label="" scale_image="true" enabled="true" mouse_opaque="false" name="menubar_search_bevel_bg" />
+
+  <line_editor bevel_style="none" border_style="line" border_thickness="0" bottom="-16"
              commit_on_focus_lost="false" enabled="true" follows="right|bottom"
-             font="SansSerif" handle_edit_keys_directly="false" height="20"
-             label="Search" left="-125" max_length="254" mouse_opaque="true"
+             font="SansSerifSmall" handle_edit_keys_directly="false" height="13"
+             label="Search" left="-95" max_length="254" mouse_opaque="true"
              name="search_editor" select_all_on_focus_received="false"
              select_on_focus="false" tab_group="1" tool_tip="Search Second Life"
-             width="104" />
-        <button bottom="-17" enabled="true" follows="right|bottom" font="SansSerifSmall"
-             halign="center" height="20" image_disabled="status_search.tga"
+             width="80" />
+        <button bottom="-16" enabled="true" follows="right|bottom" font="SansSerifSmall"
+             halign="center" height="12" image_disabled="status_search.tga"
              image_disabled_selected="status_search.tga"
              image_selected="status_search.tga" image_unselected="status_search.tga"
-             label="" label_selected="" left="-20" mouse_opaque="true" name="search_btn"
-             tool_tip="Search Second Life" width="20" />
+             label="" label_selected="" left="-16" mouse_opaque="true" name="search_btn"
+             tool_tip="Search Second Life" width="12" scale_image="true"/>
         <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-             bottom="-17" enabled="false" follows="right|bottom" font="SansSerifSmall"
-             halign="center" height="20" hidden="false" left="-20" mouse_opaque="true"
+             bottom="-16" enabled="false" follows="right|bottom" font="SansSerifSmall"
+             halign="center" height="12" left="-20" mouse_opaque="true"
              name="stat_btn" width="20" />
         <string name="packet_loss_tooltip">
                 Packet Loss