diff options
| author | Cho <cho@lindenlab.com> | 2013-02-12 01:12:47 +0000 |
|---|---|---|
| committer | Cho <cho@lindenlab.com> | 2013-02-12 01:12:47 +0000 |
| commit | 5a92a7700666f40883b72deed8429e7e06164623 (patch) | |
| tree | f4cca8caefc9c1594e0457b620209e6915f30130 /indra/newview/skins | |
| parent | c4bcd4f2c2578e8f165361441635ef47f51ec420 (diff) | |
CHUI-740 FIX Incorrect option shown in group Moderator tools "Toggle mute this participant"
Reverted changes in menu_conversation.xml, llconversationmodel.cpp, and llfloaterimcontainer.cpp
Diffstat (limited to 'indra/newview/skins')
| -rw-r--r-- | indra/newview/skins/default/xui/en/menu_conversation.xml | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/indra/newview/skins/default/xui/en/menu_conversation.xml b/indra/newview/skins/default/xui/en/menu_conversation.xml index 46c6e19fa5..8583747da0 100644 --- a/indra/newview/skins/default/xui/en/menu_conversation.xml +++ b/indra/newview/skins/default/xui/en/menu_conversation.xml @@ -163,11 +163,18 @@ </menu_item_check> <menu_item_separator layout="topleft" name="moderate_voice_separator" /> <menu_item_call - label="Toggle mute this participant" + label="Mute this participant" layout="topleft" - name="ModerateVoiceToggleMuteSelected"> + name="ModerateVoiceMuteSelected"> <on_click function="Avatar.DoToSelected" parameter="selected" /> - <on_enable function="Avatar.EnableItem" parameter="can_mute_unmute" /> + <on_enable function="Avatar.EnableItem" parameter="can_mute" /> + </menu_item_call> + <menu_item_call + label="Unmute this participant" + layout="topleft" + name="ModerateVoiceUnMuteSelected"> + <on_click function="Avatar.DoToSelected" parameter="selected" /> + <on_enable function="Avatar.EnableItem" parameter="can_unmute" /> </menu_item_call> <menu_item_call label="Mute everyone" |