diff options
author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-01-26 10:36:27 -0800 |
---|---|---|
committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-01-26 10:36:27 -0800 |
commit | 3d771ed88b1f40ca0a5869530d729a58000ef028 (patch) | |
tree | aabf54705b60159d791944019dcc48c79b1ed0ff /indra/newview/llparticipantlist.cpp | |
parent | 020f855f643a198737e7bd4066bdc1757d864a54 (diff) | |
parent | d72748a0af3e77de9a5dfedd2b8c9d87bfe7da24 (diff) |
PE merge.
Diffstat (limited to 'indra/newview/llparticipantlist.cpp')
-rw-r--r-- | indra/newview/llparticipantlist.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/indra/newview/llparticipantlist.cpp b/indra/newview/llparticipantlist.cpp index c0302eee9e..f83f3eba96 100644 --- a/indra/newview/llparticipantlist.cpp +++ b/indra/newview/llparticipantlist.cpp @@ -628,7 +628,9 @@ bool LLParticipantList::LLParticipantListMenu::enableContextMenuItem(const LLSD& } else if (item == "can_call") { - return LLVoiceClient::voiceEnabled()&&gVoiceClient->voiceWorking(); + bool not_agent = mUUIDs.front() != gAgentID; + bool can_call = not_agent && LLVoiceClient::voiceEnabled() && gVoiceClient->voiceWorking(); + return can_call; } return true; |