livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Automated merge with ssh://hg.lindenlab.com/james/gooey

meow-7.2.2
Erica 2010-01-07 17:05:31 -08:00
parent 40505adf16 807fafa82b
commit 3083ab69df
6 changed files with 34 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
indra/newview/skins/default/textures/navbar/NavBar_BG.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 210 B

After

Width:  |  Height:  |  Size: 195 B

7
indra/newview/skins/default/textures/textures.xml
View File

@ -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" />

8
indra/newview/skins/default/xui/en/favorites_bar_button.xml
View File

@ -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"

30
indra/newview/skins/default/xui/en/panel_navigation_bar.xml
View File

@ -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>

22
indra/newview/skins/default/xui/en/panel_status_bar.xml
View File

@ -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"

20
indra/newview/skins/default/xui/en/widgets/location_input.xml
View File

@ -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