summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorErica <erica@lindenlab.com>2010-01-11 17:19:41 -0800
committerErica <erica@lindenlab.com>2010-01-11 17:19:41 -0800
commita94b6b26e9681775b4ba247fba4950e0ffd990c0 (patch)
tree49543000ce42fb6d9c804dc0469ff8b25203a690
parentfb9a20802f3386bee82a8bd9a479f209374fa9a4 (diff)
Removing old art assets
-rw-r--r--indra/newview/skins/default/textures/textures.xml8
-rw-r--r--indra/newview/skins/default/xui/en/menu_viewer.xml36
-rw-r--r--indra/newview/skins/default/xui/en/panel_status_bar.xml1
3 files changed, 3 insertions, 42 deletions
diff --git a/indra/newview/skins/default/textures/textures.xml b/indra/newview/skins/default/textures/textures.xml
index dab11149b9..83121e73c8 100644
--- a/indra/newview/skins/default/textures/textures.xml
+++ b/indra/newview/skins/default/textures/textures.xml
@@ -224,7 +224,7 @@ with the same filename but different name
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" />
<texture name="Inv_Animation" file_name="icons/Inv_Animation.png" preload="false" />
@@ -676,8 +676,6 @@ with the same filename but different name
<texture name="toggle_button_off" file_name="toggle_button_off.png" preload="true" />
<texture name="toggle_button_selected" file_name="toggle_button_selected.png" preload="true" />
-
- <texture name="sm_rounded_corners_simple.tga" scale.left="4" scale.top="4" scale.bottom="4" scale.right="4" />
<texture name="color_swatch_alpha.tga" preload="true" />
<texture name="button_anim_pause.tga" />
@@ -715,10 +713,6 @@ with the same filename but different name
<texture name="map_telehub.tga" />
<texture name="map_track_16.tga" />
- <texture name="media_icon.tga" file_name="icn_label_media.tga" />
- <texture name="music_icon.tga" file_name="icn_label_music.tga" />
-
- <texture name="notify_tip_icon.tga" />
<texture name="notify_caution_icon.tga" />
<texture name="notify_next.png" preload="true" />
<texture name="notify_box_icon.tga" />
diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml
index fa7e3e86a3..45100eb1ff 100644
--- a/indra/newview/skins/default/xui/en/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en/menu_viewer.xml
@@ -198,40 +198,6 @@
function="Floater.Toggle"
parameter="nearby_media" />
</menu_item_check>
- <!--menu_item_check
- label="Block List"
- layout="topleft"
- name="Mute List">
- <menu_item_check.on_check
- function="Floater.Visible"
- parameter="mute" />
- <menu_item_check.on_click
- function="Floater.Toggle"
- parameter="mute" />
- </menu_item_check-->
- <menu_item_separator
- layout="topleft" />
- <menu_item_check
- label="(Legacy) Communicate"
- layout="topleft"
- name="Instant Message"
- shortcut="control|T">
- <menu_item_check.on_check
- function="Floater.Visible"
- parameter="communicate" />
- <menu_item_check.on_click
- function="Floater.Toggle"
- parameter="communicate" />
- </menu_item_check>
- <menu_item_call
- label="(Temp) Media Remote Ctrl"
- layout="topleft"
- name="Preferences"
- shortcut="control|alt|M">
- <menu_item_call.on_click
- function="Floater.Toggle"
- parameter="media_remote_ctrl" />
- </menu_item_call>
</menu>
<menu
label="World"
@@ -283,7 +249,7 @@
</menu_item_call>
<menu
create_jump_keys="true"
- label="About This Place"
+ label="Place Profile"
layout="topleft"
name="Land"
tear_off="true">
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 00f54feabd..bbde47d2e1 100644
--- a/indra/newview/skins/default/xui/en/panel_status_bar.xml
+++ b/indra/newview/skins/default/xui/en/panel_status_bar.xml
@@ -42,6 +42,7 @@
<button
auto_resize="true"
halign="right"
+ font="SansSerifSmall"
follows="right|top"
image_selected="BuyArrow_Over"
image_unselected="BuyArrow_Over"