diff options
| author | Gilbert Gonzales <gilbert@lindenlab.com> | 2013-02-13 17:02:13 -0800 |
|---|---|---|
| committer | Gilbert Gonzales <gilbert@lindenlab.com> | 2013-02-13 17:02:13 -0800 |
| commit | c17b41b5266cc5e2b318768d75e4686c59bb4990 (patch) | |
| tree | 6954fd8ebac3f9ef35423c95aad910ac09e594c8 /indra/newview/llconversationmodel.cpp | |
| parent | 30248c2049f6e20fa20e5b9f61cbd1402905d9b8 (diff) | |
| parent | 61ac85c5434b8273277e550bf184663090a59d1c (diff) | |
merge
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")); } |