From 6412fba748347e233ac3062a245fddf365f6bafc Mon Sep 17 00:00:00 2001
From: Todd Stinson <stinson@lindenlab.com>
Date: Thu, 12 Jul 2012 15:24:56 -0700
Subject: [PATCH] Better optimization for loading avatar names that are already
 cached.

---
 indra/newview/llpathfindingobject.cpp | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/indra/newview/llpathfindingobject.cpp b/indra/newview/llpathfindingobject.cpp
index c2f509c9511..0ca0f177a2c 100644
--- a/indra/newview/llpathfindingobject.cpp
+++ b/indra/newview/llpathfindingobject.cpp
@@ -135,7 +135,11 @@ void LLPathfindingObject::fetchOwnerName()
 	mHasOwnerName = false;
 	if (hasOwner())
 	{
-		LLAvatarNameCache::get(mOwnerUUID, boost::bind(&LLPathfindingObject::handleAvatarNameFetch, this, _1, _2));
+		mHasOwnerName = LLAvatarNameCache::get(mOwnerUUID, &mOwnerName);
+		if (!mHasOwnerName)
+		{
+			LLAvatarNameCache::get(mOwnerUUID, boost::bind(&LLPathfindingObject::handleAvatarNameFetch, this, _1, _2));
+		}
 	}
 }
 
-- 
GitLab