diff options
| author | Ychebotarev ProductEngine <ychebotarev@productengine.com> | 2010-02-05 13:04:29 +0200 |
|---|---|---|
| committer | Ychebotarev ProductEngine <ychebotarev@productengine.com> | 2010-02-05 13:04:29 +0200 |
| commit | a69a85544f628b7cd5a19f54a059eb02324419e4 (patch) | |
| tree | b496d70a74983a14dc2a1189acf21c4cacdcf625 /indra/newview/llparticipantlist.cpp | |
| parent | b79b8f87a37888decd3f82e9e255cce641a3955f (diff) | |
| parent | 553cf40d136e70f4819cb2b72d0483287db81b17 (diff) | |
merge
--HG--
branch : product-engine
Diffstat (limited to 'indra/newview/llparticipantlist.cpp')
| -rw-r--r-- | indra/newview/llparticipantlist.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llparticipantlist.cpp b/indra/newview/llparticipantlist.cpp index ad47e351ee..1c4004c37a 100644 --- a/indra/newview/llparticipantlist.cpp +++ b/indra/newview/llparticipantlist.cpp @@ -584,7 +584,7 @@ bool LLParticipantList::LLParticipantListMenu::enableContextMenuItem(const LLSD& { std::string item = userdata.asString(); if (item == "can_mute_text" || "can_block" == item || "can_share" == item || "can_im" == item - || "can_pay" == item || "can_add" == item) + || "can_pay" == item) { return mUUIDs.front() != gAgentID; } @@ -619,7 +619,7 @@ bool LLParticipantList::LLParticipantListMenu::enableContextMenuItem(const LLSD& for (;id != uuids_end; ++id) { - if ( LLAvatarActions::isFriend(*id) ) + if ( *id == gAgentID || LLAvatarActions::isFriend(*id) ) { result = false; break; |