livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Automated merge with https://hg.aws.productengine.com/secondlife/viewer-2-0/ 

--HG--
branch : product-engine
meow-7.2.2
Alexei Arabadji 2010-02-04 19:10:58 +02:00
parent c99fb12b3d 78200e2c1c
commit 4d8c14aa8f
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
indra/newview/llparticipantlist.cpp
View File

@ -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;