diff options
author | Eli Linden <eli@lindenlab.com> | 2010-02-02 11:32:33 -0800 |
---|---|---|
committer | Eli Linden <eli@lindenlab.com> | 2010-02-02 11:32:33 -0800 |
commit | a4d81d0f6995ad52f3c0fc094d93f8652600abbd (patch) | |
tree | 9fcc82ba3061423c971f56aa70b8447de2677237 /indra/newview/llparticipantlist.cpp | |
parent | 3fde73508e5b2fb5507b47d1f56d3fb47162b6fc (diff) | |
parent | b90d1d0b6f60684ba2e97959c6a9d2df0ff8ec79 (diff) |
Merge
Diffstat (limited to 'indra/newview/llparticipantlist.cpp')
-rw-r--r-- | indra/newview/llparticipantlist.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/llparticipantlist.cpp b/indra/newview/llparticipantlist.cpp index f83f3eba96..ad47e351ee 100644 --- a/indra/newview/llparticipantlist.cpp +++ b/indra/newview/llparticipantlist.cpp @@ -583,7 +583,8 @@ void LLParticipantList::LLParticipantListMenu::moderateVoiceOtherParticipants(co bool LLParticipantList::LLParticipantListMenu::enableContextMenuItem(const LLSD& userdata) { std::string item = userdata.asString(); - if (item == "can_mute_text" || "can_block" == item || "can_share" == item || "can_im" == item) + if (item == "can_mute_text" || "can_block" == item || "can_share" == item || "can_im" == item + || "can_pay" == item || "can_add" == item) { return mUUIDs.front() != gAgentID; } |