diff options
Diffstat (limited to 'indra/newview/skins/default')
6 files changed, 14 insertions, 13 deletions
diff --git a/indra/newview/skins/default/textures/textures.xml b/indra/newview/skins/default/textures/textures.xml index 9984cfcf5d..e1aafc447f 100644 --- a/indra/newview/skins/default/textures/textures.xml +++ b/indra/newview/skins/default/textures/textures.xml @@ -680,6 +680,7 @@ with the same filename but different name <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="transparent.j2c" use_mips="true" /> <!--WARNING OLD ART BELOW *do not use*--> <texture name="icn_chatbar.tga" /> diff --git a/indra/newview/skins/default/xui/en/floater_script.xml b/indra/newview/skins/default/xui/en/floater_script.xml index 984c4fcf1d..663899d4b3 100644 --- a/indra/newview/skins/default/xui/en/floater_script.xml +++ b/indra/newview/skins/default/xui/en/floater_script.xml @@ -10,7 +10,7 @@ top="0" can_dock="true" can_minimize="true" - visible="true" + visible="false" width="520" can_resize="false" min_width="350" diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml index c5200be7a9..0fd73f9b6a 100644 --- a/indra/newview/skins/default/xui/en/notifications.xml +++ b/indra/newview/skins/default/xui/en/notifications.xml @@ -5210,14 +5210,14 @@ An object named [OBJECTFROMNAME] owned by (an unknown Resident) has given you th icon="notify.tga" name="FriendshipAcceptedByMe" type="offer"> -Friend request accepted. +Friendship offer accepted. </notification> <notification icon="notify.tga" name="FriendshipDeclinedByMe" type="offer"> -Friend request declined. +Friendship offer declined. </notification> <notification diff --git a/indra/newview/skins/default/xui/en/panel_edit_classified.xml b/indra/newview/skins/default/xui/en/panel_edit_classified.xml index cc09835049..d31e7d2ed8 100644 --- a/indra/newview/skins/default/xui/en/panel_edit_classified.xml +++ b/indra/newview/skins/default/xui/en/panel_edit_classified.xml @@ -61,11 +61,11 @@ background_visible="false" height="600" left="0" - width="295"> + width="285"> <texture_picker follows="left|top|right" height="197" - width="286" + width="272" layout="topleft" top="10" left="11" @@ -92,7 +92,7 @@ top="215" name="Name:" text_color="white" - width="290"> + width="280"> Title: </text> <line_editor @@ -106,7 +106,7 @@ name="classified_name" prevalidate_callback="ascii" text_color="black" - width="290" /> + width="273" /> <text type="string" length="1" @@ -119,13 +119,13 @@ top_pad="20" name="description_label" text_color="white" - width="290"> + width="280"> Description: </text> <text_editor follows="left|top|right" height="100" - width="290" + width="273" hide_scrollbar="false" layout="topleft" left="10" @@ -146,7 +146,7 @@ name="location_label" text_color="white" top_pad="20" - width="290"> + width="280"> Location: </text> <text @@ -159,7 +159,7 @@ name="classified_location" right="-10" top_pad="2" - width="290" + width="280" word_wrap="true"> loading... </text> diff --git a/indra/newview/skins/default/xui/en/panel_nearby_chat_bar.xml b/indra/newview/skins/default/xui/en/panel_nearby_chat_bar.xml index 2b361c0628..088f098f85 100644 --- a/indra/newview/skins/default/xui/en/panel_nearby_chat_bar.xml +++ b/indra/newview/skins/default/xui/en/panel_nearby_chat_bar.xml @@ -9,7 +9,7 @@ top="21" width="310"> <string name="min_width"> - 188 + 216 </string> <string name="max_width"> 320 diff --git a/indra/newview/skins/default/xui/en/panel_preferences_sound.xml b/indra/newview/skins/default/xui/en/panel_preferences_sound.xml index c371b19fc5..c9752cf913 100644 --- a/indra/newview/skins/default/xui/en/panel_preferences_sound.xml +++ b/indra/newview/skins/default/xui/en/panel_preferences_sound.xml @@ -316,7 +316,7 @@ height="20" layout="topleft" left="25" - name="Listen from" + name="voice_chat_settings" width="200" top="210"> Voice Chat Settings |