diff options
| author | Igor Borovkov <iborovkov@productengine.com> | 2009-12-17 17:50:06 +0200 |
|---|---|---|
| committer | Igor Borovkov <iborovkov@productengine.com> | 2009-12-17 17:50:06 +0200 |
| commit | b0e984e58a10c6245a75f9bfd83f39d89e2d6369 (patch) | |
| tree | 7ccc4e17b161ea9b14a6b5d10f5c412bcb957cfb /indra/newview/llavataractions.cpp | |
| parent | 30f3397e35df30d444f17b00c43fb6135ddc0604 (diff) | |
| parent | a332ec1608ec2444c82f140d3cbdb8d3bf659343 (diff) | |
merge
--HG--
branch : product-engine
Diffstat (limited to 'indra/newview/llavataractions.cpp')
| -rw-r--r-- | indra/newview/llavataractions.cpp | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/indra/newview/llavataractions.cpp b/indra/newview/llavataractions.cpp index 636b1de4d4..c5a1ffdcb3 100644 --- a/indra/newview/llavataractions.cpp +++ b/indra/newview/llavataractions.cpp @@ -264,11 +264,8 @@ bool LLAvatarActions::isCalling(const LLUUID &id) //static bool LLAvatarActions::canCall(const LLUUID &id) { - if(isFriend(id)) - { - return LLAvatarTracker::instance().isBuddyOnline(id) && LLVoiceClient::voiceEnabled(); - } - else + // For now we do not need to check whether passed UUID is ID of agent's friend. + // Use common check of Voice Client state. { // don't need to check online/offline status because "usual resident" (resident that is not a friend) // can be only ONLINE. There is no way to see "usual resident" in OFFLINE status. If we see "usual |