diff options
author | Erica Olsen <erica@lindenlab.com> | 2009-09-22 17:31:39 +0000 |
---|---|---|
committer | Erica Olsen <erica@lindenlab.com> | 2009-09-22 17:31:39 +0000 |
commit | be41bf82c6325fc45c7c6474645f384479e27091 (patch) | |
tree | c7659957316914b36ce26ec326f197fc43cea078 /indra/newview/skins/default/xui/en | |
parent | 536e38ad51b89808f26d8e3cd107fe093862d22a (diff) |
EXT-1106 Add new art to viewer - 9/22/09 Added this week's art drop and referenced in textures.xml, EXT-1073 Add icon and style the L$ Balance button in top navigation bar
Diffstat (limited to 'indra/newview/skins/default/xui/en')
3 files changed, 70 insertions, 63 deletions
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 80dca8c0c1..13ceab7604 100644 --- a/indra/newview/skins/default/xui/en/panel_navigation_bar.xml +++ b/indra/newview/skins/default/xui/en/panel_navigation_bar.xml @@ -2,7 +2,7 @@ <panel background_opaque="true" background_visible="true" - bg_opaque_color="0.25 0.25 0.25 1" + bg_opaque_color="MouseGray" follows="left|top|right" height="60" layout="topleft" @@ -14,7 +14,7 @@ height="60" layout="topleft" name="navigation_panel" - width="600"> + width="600"> <button follows="left|top" font="SansSerifSmall" @@ -32,7 +32,7 @@ tool_tip="Go back to previous location" top="3" width="31" /> - + <button follows="left|top" font="SansSerifSmall" @@ -90,7 +90,7 @@ width="20" /> --> </location_input> - + <!-- <button --> <!-- follows="right|top" --> <!-- height="20" --> @@ -128,7 +128,7 @@ label="Search" /> </search_combo_box> </panel> - + <favorites_bar follows="left|right|top" height="25" diff --git a/indra/newview/skins/default/xui/en/panel_side_tray.xml b/indra/newview/skins/default/xui/en/panel_side_tray.xml index c5ebc8e1a3..418b88b7b5 100644 --- a/indra/newview/skins/default/xui/en/panel_side_tray.xml +++ b/indra/newview/skins/default/xui/en/panel_side_tray.xml @@ -11,7 +11,7 @@ help_topic="sidebar_home" tab_title="Home" description="Home." - image="BackArrow_Off" + image="TabIcon_Open_Off" mouse_opaque="false" background_opaque="false" background_visible="true" @@ -59,6 +59,7 @@ filename="panel_group_info_sidetray.xml" label="Group Info" border="true" + font="SansSerifBold" /> <panel class="panel_block_list_sidetray" @@ -66,6 +67,7 @@ filename="panel_block_list_sidetray.xml" label="Blocked Residents & Objects" border="true" + font="SansSerifBold" /> </panel_container> @@ -86,6 +88,7 @@ filename="panel_places.xml" label="Places" border="true" + font="SansSerifBold" /> </sidetray_tab> @@ -123,6 +126,8 @@ name="panel_appearance" filename="panel_appearance.xml" border="true" + label="Edit Appearance" + font="SansSerifBold" /> </sidetray_tab> 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 f597211ec9..c178554287 100644 --- a/indra/newview/skins/default/xui/en/panel_status_bar.xml +++ b/indra/newview/skins/default/xui/en/panel_status_bar.xml @@ -2,14 +2,14 @@ <panel background_opaque="true" background_visible="true" - bg_opaque_color="0.25 0.25 0.25 1" + bg_opaque_color="MouseGray" follows="top|left|right" - height="18" + height="19" layout="topleft" left="0" mouse_opaque="false" name="status" - top="18" + top="19" width="1000"> <panel.string name="StatBarDaysOfWeek"> @@ -41,164 +41,166 @@ </panel.string> <button auto_resize="true" + halign="left" follows="right|bottom" font="SansSerifSmall" - height="16" + image_color="White_05" + flash_color="EmphasisColor" + image_overlay="BuyArrow_Over" + height="18" layout="topleft" - left="-150" + left="-210" name="buycurrency" picture_style="true" - tool_tip="Account Balance / Buy currency" - top="1" - width="60" /> + tool_tip="My Balance / Buy currency" + top="0" + width="117" /> <text type="string" length="1" disabled_color="TimeTextColor" follows="right|bottom" halign="right" - height="20" + height="16" + top="3" layout="topleft" left_pad="5" name="TimeText" text_color="TimeTextColor" tool_tip="Current Time (Pacific)" - top_delta="-1" - v_pad="2" width="80"> 12:00 AM </text> <button follows="right|bottom" height="16" - image_selected="status_script_debug.tga" - image_unselected="status_script_debug.tga" layout="topleft" left_delta="-537" + image_selected="Inv_DangerousScript" + image_unselected="Inv_DangerousScript" name="scriptout" picture_style="true" scale_image="false" tool_tip="Script Warnings and Errors" - top_delta="2" + top="0" visible="false" width="16" /> <button follows="right|bottom" - height="18" - image_selected="status_health.tga" - image_unselected="status_health.tga" + height="16" + image_selected="Health" + image_unselected="Health" layout="topleft" - left_delta="16" + left_pad="7" name="health" picture_style="true" scale_image="false" tool_tip="Health" - top_delta="2" + top="0" visible="false" - width="24" /> + width="16" /> <text type="string" length="1" disabled_color="HealthTextColor" follows="rsight|bottom" font_shadow="hard" - height="18" + height="16" layout="topleft" - left_delta="24" + left_pad="18" name="HealthText" text_color="HealthTextColor" tool_tip="Health" - top_delta="-4" - v_pad="2" + top="0" visible="false" width="31"> 100% </text> <button follows="right|bottom" - height="18" - image_selected="status_no_fly.tga" - image_unselected="status_no_fly.tga" + height="16" + image_selected="Move_Fly_Disabled" + image_unselected="Move_Fly_Disabled" layout="topleft" - left_delta="31" + left_pad="7" name="no_fly" picture_style="true" scale_image="false" tool_tip="Flying not allowed" - top_delta="4" + top="3" visible="false" - width="24" /> + width="16" /> <button follows="right|bottom" - height="18" - image_selected="status_no_build.tga" - image_unselected="status_no_build.tga" + height="16" + image_selected="Tool_Create" + image_unselected="Tool_Create" layout="topleft" - left_delta="24" + left_pad="7" name="no_build" picture_style="true" scale_image="false" tool_tip="Building/Rezzing not allowed" - top_delta="0" + top="0" visible="false" - width="24" /> + width="16" /> <button follows="right|bottom" - height="18" - image_selected="status_no_scripts.tga" - image_unselected="status_no_scripts.tga" + height="16" + image_selected="Inv_Script" + image_unselected="Inv_Script" layout="topleft" - left_delta="24" + left_pad="7" name="no_scripts" picture_style="true" scale_image="false" tool_tip="Scripts not allowed" - top_delta="0" + top="0" visible="false" - width="24" /> + width="16" /> <button follows="right|bottom" - height="18" - image_selected="status_no_push.tga" - image_unselected="status_no_push.tga" + height="16" + image_selected="Inv_Gesture" + image_unselected="Inv_Gesture" layout="topleft" - left_delta="24" + left_pad="7" name="restrictpush" picture_style="true" scale_image="false" tool_tip="No Pushing" - top_delta="0" + top="0" visible="false" - width="24" /> + width="16" /> <button follows="right|bottom" height="18" - image_selected="status_no_voice.tga" - image_unselected="status_no_voice.tga" + image_selected="Microphone_Mute" + image_unselected="Microphone_Mute" layout="topleft" - left_delta="24" + left_pad="7" name="status_no_voice" picture_style="true" scale_image="false" tool_tip="Voice not available here" - top_delta="0" + top="1" visible="false" - width="24" /> + width="16" /> <button follows="right|bottom" height="16" - image_selected="status_buy_land_pressed.tga" - image_unselected="status_buy_land.tga" + image_selected="Icon_For_Sale" + image_unselected="Icon_For_Sale" layout="topleft" left_pad="7" name="buyland" picture_style="true" tool_tip="Buy this parcel" - top_delta="-3" + top="0" visible="false" width="16" /> <text - enabled="false" + enabled="true" follows="right|bottom" halign="center" height="12" |