From ff52ac089f9ed67410f80fe66d0b997f0f2dafcc Mon Sep 17 00:00:00 2001 From: Roxanne Skelly Date: Wed, 15 Jul 2009 21:50:42 +0000 Subject: DEV-34822 viewer 1.23 merge DEV-32649 Merge the diamondware/vivox voice code -r124876 -r125220 --- indra/newview/llavataractions.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra/newview/llavataractions.cpp') diff --git a/indra/newview/llavataractions.cpp b/indra/newview/llavataractions.cpp index c3deb602ee..118a546ada 100644 --- a/indra/newview/llavataractions.cpp +++ b/indra/newview/llavataractions.cpp @@ -290,7 +290,7 @@ bool LLAvatarActions::canCall(const LLUUID &id) // can be only ONLINE. There is no way to see "usual resident" in OFFLINE status. If we see "usual // resident" it automatically means that the resident is ONLINE. So to make a call to the "usual resident" // we need to check only that "our" voice is enabled. - return LLVoiceClient::voiceEnabled(); + return LLVoiceClient::getInstance()->voiceEnabled(); } } -- cgit v1.2.3 From 858d1e9ad00db909be54112dbffc1c709dd7ba2e Mon Sep 17 00:00:00 2001 From: Igor Borovkov Date: Mon, 22 Mar 2010 17:02:44 +0200 Subject: fixed EXT-6476 (waiting).txt chat log file with "(waiting)" instead of avatar name gets created when Offering Teleport from Search Floater offer teleport action is put on hold until Name Cache gets updated with appropriate avatar name --HG-- branch : product-engine --- indra/newview/llavataractions.cpp | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'indra/newview/llavataractions.cpp') diff --git a/indra/newview/llavataractions.cpp b/indra/newview/llavataractions.cpp index e6666c7f83..cb518f0ad6 100644 --- a/indra/newview/llavataractions.cpp +++ b/indra/newview/llavataractions.cpp @@ -161,6 +161,14 @@ void LLAvatarActions::offerTeleport(const LLUUID& invitee) if (invitee.isNull()) return; + //waiting until Name Cache gets updated with corresponding avatar name + std::string just_to_request_name; + if (!gCacheName->getFullName(invitee, just_to_request_name)) + { + gCacheName->get(invitee, FALSE, boost::bind((void (*)(const LLUUID&)) &LLAvatarActions::offerTeleport, invitee)); + return; + } + LLDynamicArray ids; ids.push_back(invitee); offerTeleport(ids); -- cgit v1.2.3 From d5d9668a59895874951fb3e5927ea0159270a6e8 Mon Sep 17 00:00:00 2001 From: Paul Guslisty Date: Thu, 25 Mar 2010 09:04:01 +0200 Subject: Fixed low bug EXT-6488 (Teleport menuitem is enabled for offline residents in the context menu and inspectors) - Added a check for a teleport offer ability. In XML created a paremeter and check it in source code. Reviewed by Leyla Farazha at https://codereview.productengine.com/secondlife/r/86/ --HG-- branch : product-engine --- indra/newview/llavataractions.cpp | 14 ++++++++++++++ 1 file changed, 14 insertions(+) (limited to 'indra/newview/llavataractions.cpp') diff --git a/indra/newview/llavataractions.cpp b/indra/newview/llavataractions.cpp index cb518f0ad6..699916b0d6 100644 --- a/indra/newview/llavataractions.cpp +++ b/indra/newview/llavataractions.cpp @@ -442,6 +442,20 @@ void LLAvatarActions::toggleBlock(const LLUUID& id) LLMuteList::getInstance()->add(mute); } } +// static +bool LLAvatarActions::canOfferTeleport(const LLUUID& id) +{ + // First use LLAvatarTracker::isBuddy() + // If LLAvatarTracker::instance().isBuddyOnline function only is used + // then for avatars that are online and not a friend it will return false. + // But we should give an ability to offer a teleport for such avatars. + if(LLAvatarTracker::instance().isBuddy(id)) + { + return LLAvatarTracker::instance().isBuddyOnline(id); + } + + return true; +} void LLAvatarActions::inviteToGroup(const LLUUID& id) { -- cgit v1.2.3