diff options
| author | Merov Linden <merov@lindenlab.com> | 2012-12-05 16:10:58 -0800 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2012-12-05 16:10:58 -0800 |
| commit | 32d7131b1034d03fa9d3fdde8b86ee9880bb4f67 (patch) | |
| tree | 9c5c871605000578e78c634ace3fc0216b611898 /indra/newview/llconversationmodel.cpp | |
| parent | a4a2cc62c3411f0391b90d9720a13b49b0e123ef (diff) | |
| parent | ffe80818064572a19b52d4f39f0e14538f701275 (diff) | |
Pull merge from richard/viewer-chui
Diffstat (limited to 'indra/newview/llconversationmodel.cpp')
| -rw-r--r-- | indra/newview/llconversationmodel.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/indra/newview/llconversationmodel.cpp b/indra/newview/llconversationmodel.cpp index 0b7c3939df..4328c60b1a 100644 --- a/indra/newview/llconversationmodel.cpp +++ b/indra/newview/llconversationmodel.cpp @@ -115,6 +115,7 @@ void LLConversationItem::buildParticipantMenuOptions(menuentry_vec_t& items) items.push_back(std::string("share")); items.push_back(std::string("pay")); items.push_back(std::string("block_unblock")); + items.push_back(std::string("MuteText")); if(this->getType() != CONV_SESSION_1_ON_1) { |