summaryrefslogtreecommitdiff
path: root/indra/newview
diff options
context:
space:
mode:
authormaxim_productengine <mnikolenko@productengine.com>2012-10-04 14:30:16 +0300
committermaxim_productengine <mnikolenko@productengine.com>2012-10-04 14:30:16 +0300
commit8013e645603d1075b848ef91178af0fa3f9dc38c (patch)
tree0afe813cc2f271b02e075cfb2a482b0db8bc518b /indra/newview
parent5d846e141464f02a1d896ffa82d639f973f8044b (diff)
CHUI-313 FIXED "Conversations", "Conversations Log" menu items are added
Diffstat (limited to 'indra/newview')
-rw-r--r--indra/newview/skins/default/xui/en/menu_viewer.xml25
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">