diff options
| author | Merov Linden <merov@lindenlab.com> | 2013-02-13 15:36:53 -0800 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2013-02-13 15:36:53 -0800 |
| commit | 61ac85c5434b8273277e550bf184663090a59d1c (patch) | |
| tree | a95562ac6d5d9b36497a8b0cc0248ddc40afbffc /indra/newview/llconversationmodel.cpp | |
| parent | 2f49f5ed0e03375df97c877f139f2283f1a1376d (diff) | |
| parent | 017f9cad769161ae7ef8fdf509685c36192678ae (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")); } |