summaryrefslogtreecommitdiff
path: root/indra/newview/llconversationmodel.cpp
diff options
context:
space:
mode:
authorCho <cho@lindenlab.com>2013-02-12 01:12:47 +0000
committerCho <cho@lindenlab.com>2013-02-12 01:12:47 +0000
commit5a92a7700666f40883b72deed8429e7e06164623 (patch)
treef4cca8caefc9c1594e0457b620209e6915f30130 /indra/newview/llconversationmodel.cpp
parentc4bcd4f2c2578e8f165361441635ef47f51ec420 (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/llconversationmodel.cpp')
-rw-r--r--indra/newview/llconversationmodel.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/llconversationmodel.cpp b/indra/newview/llconversationmodel.cpp
index bfc564f407..0977056b2a 100644
--- a/indra/newview/llconversationmodel.cpp
+++ b/indra/newview/llconversationmodel.cpp
@@ -151,7 +151,8 @@ void LLConversationItem::buildParticipantMenuOptions(menuentry_vec_t& items, U32
items.push_back(std::string("Moderator Options"));
items.push_back(std::string("AllowTextChat"));
items.push_back(std::string("moderate_voice_separator"));
- items.push_back(std::string("ModerateVoiceToggleMuteSelected"));
+ items.push_back(std::string("ModerateVoiceMuteSelected"));
+ items.push_back(std::string("ModerateVoiceUnMuteSelected"));
items.push_back(std::string("ModerateVoiceMute"));
items.push_back(std::string("ModerateVoiceUnmute"));
}