diff options
Diffstat (limited to 'indra/newview/skins')
3 files changed, 24 insertions, 14 deletions
diff --git a/indra/newview/skins/default/xui/en/floater_im_session.xml b/indra/newview/skins/default/xui/en/floater_im_session.xml index 5c74f7f9bb..8cd0463de8 100644 --- a/indra/newview/skins/default/xui/en/floater_im_session.xml +++ b/indra/newview/skins/default/xui/en/floater_im_session.xml @@ -246,7 +246,7 @@ parse_highlights="true" parse_urls="true" width="230" - left="0"> + left="5"> </chat_history> </layout_panel> </layout_stack> diff --git a/indra/newview/skins/default/xui/en/menu_participant_view.xml b/indra/newview/skins/default/xui/en/menu_participant_view.xml index 0043c14479..6fa0707eea 100644 --- a/indra/newview/skins/default/xui/en/menu_participant_view.xml +++ b/indra/newview/skins/default/xui/en/menu_participant_view.xml @@ -59,17 +59,6 @@ function="IMFloaterContainer.Check" parameter="sort_participants_by_recent" /> </menu_item_check> - <menu_item_check - label="Sort participants by distance from you" - layout="topleft" - name="sort_participants_by_distance"> - <on_click - function="IMFloaterContainer.Action" - parameter="sort_participants_by_distance" /> - <on_check - function="IMFloaterContainer.Check" - parameter="sort_participants_by_distance" /> - </menu_item_check> <menu_item_separator layout="topleft" /> <menu_item_call diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml index 88b30c8272..c805b6db42 100644 --- a/indra/newview/skins/default/xui/en/menu_viewer.xml +++ b/indra/newview/skins/default/xui/en/menu_viewer.xml @@ -218,8 +218,18 @@ label="Communicate" name="Communicate" tear_off="true"> - <menu_item_check - label="Chat..." + <menu_item_check + label="Conversations..." + name="Conversations"> + <menu_item_check.on_check + function="Floater.IsOpen" + parameter="im_container" /> + <menu_item_check.on_click + function="Floater.ToggleOrBringToFront" + parameter="im_container" /> + </menu_item_check> + <menu_item_check + label="Nearby Chat..." name="Nearby Chat" shortcut="control|H" use_mac_ctrl="true"> @@ -244,6 +254,17 @@ parameter="speak" /> </menu_item_check> <menu_item_check + label="Conversations Log..." + name="ConversationsLog"> + <menu_item_check.on_check + function="Floater.Visible" + parameter="conversation" /> + <menu_item_check.on_click + function="Floater.Toggle" + parameter="conversation" /> + </menu_item_check> + <menu_item_separator/> + <menu_item_check label="Voice morphing..." name="ShowVoice" visibility_control="VoiceMorphingEnabled"> |