diff options
| author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2010-02-04 16:23:24 -0500 |
|---|---|---|
| committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2010-02-04 16:23:24 -0500 |
| commit | 2b5a3de8096fa9a4e8c523aab22493adf7411d3f (patch) | |
| tree | 319b05acdff8b3eae2999e5c24855d21e905c78f /indra/newview/llparticipantlist.cpp | |
| parent | a165279acd57c6c0e2e6492b7de39a9e614327af (diff) | |
| parent | 21adf86c567d3cad81e762c0215c8ec8f8c5eab6 (diff) | |
merge
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; |