diff options
| author | Merov Linden <merov@lindenlab.com> | 2013-02-14 17:28:50 -0800 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2013-02-14 17:28:50 -0800 |
| commit | 4aa22db0379ba66017fe551c5466e4c1c6a888cb (patch) | |
| tree | e302711c1f9e324ddefdc8ea821f4b980f28bf08 /indra/newview/llconversationmodel.cpp | |
| parent | 96bc3d206d890255300d367a70493f93cd0dc5f8 (diff) | |
| parent | 638d94eef75799d47f8b913e0909b4079e55c03b (diff) | |
Pull merge from lindenlab/viewer-chui
Diffstat (limited to 'indra/newview/llconversationmodel.cpp')
| -rw-r--r-- | indra/newview/llconversationmodel.cpp | 3 |
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")); } |