summaryrefslogtreecommitdiff
path: root/indra/newview/llpathfindingobject.cpp
diff options
context:
space:
mode:
authorDave Parks <davep@lindenlab.com>2013-04-02 11:18:29 -0500
committerDave Parks <davep@lindenlab.com>2013-04-02 11:18:29 -0500
commit3e8da4e8d5ec7a477db00de99ec4c75985c17094 (patch)
treea76d4b02258d9b2d3d12e7640a7a50830c007241 /indra/newview/llpathfindingobject.cpp
parent8f9ddc67fdcdf53313ae4217ffa551a5a157c765 (diff)
parent5f5732365b3c5a3b85fdc0be6fbbbbc0c2de01f2 (diff)
Automated merge with https://bitbucket.org/lindenlab/davep-materials
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));
}
}