diff options
| author | Roxie Linden <roxie@lindenlab.com> | 2010-02-26 12:02:34 -0800 |
|---|---|---|
| committer | Roxie Linden <roxie@lindenlab.com> | 2010-02-26 12:02:34 -0800 |
| commit | 13d4257868451d1e3a5797bd02a0e6f749cc0836 (patch) | |
| tree | bafaaa1220764a6f989f84cb434e82ef341a27c7 /indra/newview/llparticipantlist.cpp | |
| parent | 2d7697dfade4ecbb8fbe9b26a5332fc9e93f5669 (diff) | |
| parent | fc70ca5403acdd99b2235dbf4e513a4dd806c850 (diff) | |
automated 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 dc0839c774..b90d2eedfc 100644 --- a/indra/newview/llparticipantlist.cpp +++ b/indra/newview/llparticipantlist.cpp @@ -582,7 +582,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; } |