summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
Diffstat (limited to 'indra')
-rw-r--r--indra/newview/skins/default/textures/textures.xml20
-rw-r--r--indra/newview/skins/default/xui/en/panel_navigation_bar.xml4
-rw-r--r--indra/newview/skins/default/xui/en/panel_status_bar.xml34
-rw-r--r--indra/newview/skins/default/xui/en/widgets/location_input.xml16
4 files changed, 41 insertions, 33 deletions
diff --git a/indra/newview/skins/default/textures/textures.xml b/indra/newview/skins/default/textures/textures.xml
index 83121e73c8..ef6df7df1b 100644
--- a/indra/newview/skins/default/textures/textures.xml
+++ b/indra/newview/skins/default/textures/textures.xml
@@ -648,6 +648,12 @@ with the same filename but different name
<texture name="PowerOff_Over" file_name="icons/PowerOff_Over.png" preload="false" />
<texture name="PowerOff_Press" file_name="icons/PowerOff_Press.png" preload="false" />
+ <texture name="pixiesmall.j2c" use_mips="true" />
+ <texture name="script_error.j2c" use_mips="true" />
+ <texture name="silhouette.j2c" use_mips="true" />
+ <texture name="foot_shadow.j2c" use_mips="true" />
+ <texture name="cloud-particle.j2c" use_mips="true" />
+
<!--WARNING OLD ART BELOW *do not use*-->
<texture name="icn_chatbar.tga" />
<texture name="icn_media_web.tga" preload="true" />
@@ -694,7 +700,6 @@ with the same filename but different name
<texture name="icon_event_mature.tga" />
<texture name="icon_for_sale.tga" />
<texture name="icon_place_for_sale.tga" />
- <texture name="icon_popular.tga" />
<texture name="icon_top_pick.tga" />
<texture name="lag_status_critical.tga" />
@@ -717,19 +722,6 @@ with the same filename but different name
<texture name="notify_next.png" preload="true" />
<texture name="notify_box_icon.tga" />
- <texture name="pixiesmall.j2c" use_mips="true" />
- <texture name="script_error.j2c" use_mips="true" />
- <texture name="silhouette.j2c" use_mips="true" />
- <texture name="foot_shadow.j2c" use_mips="true" />
- <texture name="cloud-particle.j2c" use_mips="true" />
-
- <texture name="status_no_build.tga" />
- <texture name="status_voice.tga" />
- <texture name="status_no_fly.tga" />
- <texture name="status_health.tga" />
- <texture name="status_no_push.tga" />
- <texture name="status_no_scripts.tga" />
-
<texture name="icn_active-speakers-dot-lvl0.tga" />
<texture name="icn_active-speakers-dot-lvl1.tga" />
<texture name="icn_active-speakers-dot-lvl2.tga" />
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 e2884dbedc..9ad99b1f13 100644
--- a/indra/newview/skins/default/xui/en/panel_navigation_bar.xml
+++ b/indra/newview/skins/default/xui/en/panel_navigation_bar.xml
@@ -47,7 +47,7 @@
left="10"
name="back_btn"
tool_tip="Go back to previous location"
- top="3"
+ top="2"
width="31" />
<button
follows="left|top"
@@ -92,7 +92,6 @@
width="20" />
-->
</location_input>
-
<!-- <button -->
<!-- follows="right|top" -->
<!-- height="20" -->
@@ -108,7 +107,6 @@
<!-- name="search_bg" -->
<!-- top_delta="0" -->
<!-- width="168" /> -->
-
<search_combo_box
bevel_style="none"
border_style="line"
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 bbde47d2e1..420a6eb173 100644
--- a/indra/newview/skins/default/xui/en/panel_status_bar.xml
+++ b/indra/newview/skins/default/xui/en/panel_status_bar.xml
@@ -44,17 +44,34 @@
halign="right"
font="SansSerifSmall"
follows="right|top"
+ image_overlay=""
+ image_selected="spacer35.tga"
+ image_unselected="spacer35.tga"
+ image_pressed="spacer35.tga"
+ height="16"
+ right="-228"
+ label_shadow="false"
+ name="buycurrency"
+ tool_tip="My Balance"
+ top="5"
+ width="100" />
+ <button
+ auto_resize="true"
+ halign="right"
+ font="SansSerifSmall"
+ follows="right|top"
image_selected="BuyArrow_Over"
image_unselected="BuyArrow_Over"
image_pressed="BuyArrow_Press"
height="16"
- right="-128"
- label_color="White"
+ label="Buy L$"
+ label_color="EmphasisColor"
+ left_pad="0"
label_shadow="false"
- name="buycurrency"
+ name="buyL"
pad_right="20px"
- tool_tip="My Balance: Click to buy more L$"
- top="3"
+ tool_tip="Click to buy more L$"
+ top="5"
width="100" />
<text
type="string"
@@ -63,24 +80,23 @@
follows="right|bottom"
halign="right"
height="16"
- top="4"
+ top="7"
layout="topleft"
left_pad="0"
name="TimeText"
- text_color="TimeTextColor"
tool_tip="Current time (Pacific)"
width="85">
12:00 AM
</text>
<button
follows="right|bottom"
- height="16"
+ height="15"
image_selected="AudioMute_Off"
image_pressed="Audio_Press"
image_unselected="Audio_Off"
is_toggle="true"
left_pad="18"
- top="1"
+ top="4"
name="volume_btn"
tool_tip="Global Volume Control"
width="16" />
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 67bb7c1896..0f1c8d0635 100644
--- a/indra/newview/skins/default/xui/en/widgets/location_input.xml
+++ b/indra/newview/skins/default/xui/en/widgets/location_input.xml
@@ -96,7 +96,7 @@
name="damage_icon"
width="14"
height="13"
- top="22"
+ top="25"
left="2"
follows="right|top"
image_name="Parcel_Damage_Dark"
@@ -112,11 +112,13 @@
font="SansSerifSmall"
text_color="TextFgColor"
/>
-
- <combo_button name="Location History"
- label=""
- pad_right="0"/>
- <combo_list bg_writeable_color="MenuDefaultBgColor" page_lines="10"
+ <combo_button
+ name="Location History"
+ label=""
+ pad_right="0"/>
+ <combo_list
+ bg_writeable_color="MenuDefaultBgColor"
+ page_lines="10"
scroll_bar_bg_visible="true" />
<combo_editor name="Combo Text Entry"
text_pad_left="22"
@@ -124,5 +126,5 @@
font="SansSerifSmall"
bevel_style="none"
border_style="line"
- border.border_thickness="0"/>
+ border.border_thickness="0" />
</location_input>