summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Antipov <mantipov@productengine.com>2009-12-17 17:03:48 +0200
committerMike Antipov <mantipov@productengine.com>2009-12-17 17:03:48 +0200
commita332ec1608ec2444c82f140d3cbdb8d3bf659343 (patch)
tree5d0b27fa6b41faeda289b98c06f5585693753915
parentffaaea10ef89e060f3414e3c388df1a6ff4d5f44 (diff)
Fixed major bug EXT-3467 (Call button/menuitem is disabled for offline avatars)
-- implemented verifying only of Voice Client state to enable/disable Call button --HG-- branch : product-engine
-rw-r--r--indra/newview/llavataractions.cpp7
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