From 858d1e9ad00db909be54112dbffc1c709dd7ba2e Mon Sep 17 00:00:00 2001
From: Igor Borovkov <iborovkov@productengine.com>
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(+)

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<LLUUID> ids;
 	ids.push_back(invitee);
 	offerTeleport(ids);
-- 
cgit v1.2.3