summaryrefslogtreecommitdiff
path: root/indra/newview/llparticipantlist.cpp
diff options
context:
space:
mode:
authorTofu Linden <tofu.linden@lindenlab.com>2010-02-03 16:08:44 +0000
committerTofu Linden <tofu.linden@lindenlab.com>2010-02-03 16:08:44 +0000
commita171848fd4fed2fe915bcb42de96359112cf95e1 (patch)
tree5f4d85f4469f2d737864b3a07b367fa81040f3a3 /indra/newview/llparticipantlist.cpp
parentcc5920bed7790db49a062fb98ce54191f06ed98c (diff)
parentfc70ca5403acdd99b2235dbf4e513a4dd806c850 (diff)
merge from viewer2.
Diffstat (limited to 'indra/newview/llparticipantlist.cpp')
-rw-r--r--indra/newview/llparticipantlist.cpp3
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;
}