diff options
| author | angela <angela@lindenlab.com> | 2010-02-03 13:56:39 +0800 |
|---|---|---|
| committer | angela <angela@lindenlab.com> | 2010-02-03 13:56:39 +0800 |
| commit | 460ec67b97bc210c0a03483dd0b754e92fabe806 (patch) | |
| tree | 90bd49da9c7e23e6b90ebf04b8fcc9847b4f414e /indra/newview/llparticipantlist.cpp | |
| parent | 1094fa28c618370af9a95cf823cbd9287c92dd24 (diff) | |
| parent | 86923afd27d76734cf1274fa788928230c232a4d (diff) | |
resolve merge in llsidepanelinventory.cpp
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; } |