diff options
Diffstat (limited to 'indra/newview/skins/default/xui')
5 files changed, 21 insertions, 11 deletions
diff --git a/indra/newview/skins/default/xui/en/floater_camera.xml b/indra/newview/skins/default/xui/en/floater_camera.xml index 22bc488a92..4b4821a383 100644 --- a/indra/newview/skins/default/xui/en/floater_camera.xml +++ b/indra/newview/skins/default/xui/en/floater_camera.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> <floater positioning="specified" - left="458" + left="643" bottom="-80" follows="left|bottom" legacy_header_height="18" diff --git a/indra/newview/skins/default/xui/en/floater_destinations.xml b/indra/newview/skins/default/xui/en/floater_destinations.xml index 39aa8e07bb..41b57530fc 100644 --- a/indra/newview/skins/default/xui/en/floater_destinations.xml +++ b/indra/newview/skins/default/xui/en/floater_destinations.xml @@ -1,6 +1,5 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> <floater - positioning="cascading" ignore_ui_scale="false" legacy_header_height="225" can_minimize="true" @@ -12,16 +11,18 @@ height="230" layout="topleft" name="Destinations" + right="-10" + bottom="-80" single_instance="true" help_topic="destinations" save_rect="true" save_visibility="true" title="DESTINATIONS" - width="840"> + width="550"> <web_browser top="25" height="200" - width="840" + width="550" follows="all" name="destination_guide_contents" trusted_content="true"/> diff --git a/indra/newview/skins/default/xui/en/floater_im_container.xml b/indra/newview/skins/default/xui/en/floater_im_container.xml index 4aa7c88312..152c897120 100644 --- a/indra/newview/skins/default/xui/en/floater_im_container.xml +++ b/indra/newview/skins/default/xui/en/floater_im_container.xml @@ -3,7 +3,7 @@ can_close="true" can_minimize="true" can_resize="true" - height="430" + height="230" layout="topleft" min_height="50" name="floater_im_box" @@ -13,7 +13,8 @@ single_instance="true" reuse_instance="true" title="CONVERSATIONS" - width="680"> + bottom="-80" + width="450"> <string name="collapse_icon" value="Conv_toolbar_collapse"/> @@ -23,13 +24,13 @@ <layout_stack animate="true" follows="all" - height="430" + height="230" layout="topleft" left="0" name="conversations_stack" orientation="horizontal" top="0" - width="680"> + width="450"> <layout_panel auto_resize="true" user_resize="true" diff --git a/indra/newview/skins/default/xui/en/floater_moveview.xml b/indra/newview/skins/default/xui/en/floater_moveview.xml index 4e7ee7913f..02d9805ddf 100644 --- a/indra/newview/skins/default/xui/en/floater_moveview.xml +++ b/indra/newview/skins/default/xui/en/floater_moveview.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> <floater positioning="specified" - left="320" + left="505" bottom="-80" legacy_header_height="18" can_dock="false" diff --git a/indra/newview/skins/default/xui/en/menu_conversation.xml b/indra/newview/skins/default/xui/en/menu_conversation.xml index 908b2c174f..01ef8ebdb5 100644 --- a/indra/newview/skins/default/xui/en/menu_conversation.xml +++ b/indra/newview/skins/default/xui/en/menu_conversation.xml @@ -105,14 +105,22 @@ <on_enable function="Avatar.EnableItem" parameter="can_pay" /> </menu_item_call> <menu_item_check - label="Block / unblock" + label="Block Voice" layout="topleft" name="block_unblock"> <on_click function="Avatar.DoToSelected" parameter="block_unblock" /> <on_check function="Avatar.CheckItem" parameter="is_blocked" /> <on_enable function="Avatar.EnableItem" parameter="can_block" /> </menu_item_check> - <menu_item_call + <menu_item_check + label="Block Text" + layout="topleft" + name="MuteText"> + <on_click function="Avatar.DoToSelected" parameter="mute_unmute" /> + <on_check function="Avatar.CheckItem" parameter="is_muted" /> + <on_enable function="Avatar.EnableItem" parameter="can_block" /> + </menu_item_check> + <menu_item_call label="Group Profile" layout="topleft" name="group_profile"> |