summaryrefslogtreecommitdiff
path: root/indra/newview/llpathfindingobject.cpp
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2013-03-13 15:15:15 -0400
committerOz Linden <oz@lindenlab.com>2013-03-13 15:15:15 -0400
commit75722baf295aff7927bff3c70cdf0ec27399cb37 (patch)
treea7a3fccc7bfebb4605c561e34ac66ad3c478368e /indra/newview/llpathfindingobject.cpp
parent5c68b2456e8603322a1f12694c196246752bab53 (diff)
parentd348deb7049cbaef7c228000525c7ee5a265464c (diff)
merge changes for latest viewer-development
Diffstat (limited to 'indra/newview/llpathfindingobject.cpp')
-rw-r--r--indra/newview/llpathfindingobject.cpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/indra/newview/llpathfindingobject.cpp b/indra/newview/llpathfindingobject.cpp
index 858d3203c0..900763eae4 100644
--- a/indra/newview/llpathfindingobject.cpp
+++ b/indra/newview/llpathfindingobject.cpp
@@ -173,6 +173,7 @@ void LLPathfindingObject::fetchOwnerName()
mHasOwnerName = LLAvatarNameCache::get(mOwnerUUID, &mOwnerName);
if (!mHasOwnerName)
{
+ disconnectAvatarNameCacheConnection();
mAvatarNameCacheConnection = LLAvatarNameCache::get(mOwnerUUID, boost::bind(&LLPathfindingObject::handleAvatarNameFetch, this, _1, _2));
}
}