diff options
| author | Gilbert Gonzales <gilbert@lindenlab.com> | 2012-10-11 12:18:35 -0700 |
|---|---|---|
| committer | Gilbert Gonzales <gilbert@lindenlab.com> | 2012-10-11 12:18:35 -0700 |
| commit | b871d67710cc4168752dee976725e190c0cd9960 (patch) | |
| tree | f6c56ec4da61c6bcb7331ba5d16aa133742e4eb6 /indra/newview/skins/default/xui/en/menu_viewer.xml | |
| parent | 375f380ea388b37c34ace9570822d0c117b3d2f1 (diff) | |
| parent | 0ff5a0c8ceebfab0d786aaf027c7c548170afe8d (diff) | |
merging in latest changes
Diffstat (limited to 'indra/newview/skins/default/xui/en/menu_viewer.xml')
| -rw-r--r-- | indra/newview/skins/default/xui/en/menu_viewer.xml | 25 |
1 files changed, 23 insertions, 2 deletions
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"> |