summaryrefslogtreecommitdiff
path: root/indra/newview/llpathfindingobject.cpp
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2013-06-19 13:59:52 -0400
committerOz Linden <oz@lindenlab.com>2013-06-19 13:59:52 -0400
commite23228fef2834587af490d0345f29212445666d8 (patch)
treedfa761027aca1227ec1817707f8141b833c061df /indra/newview/llpathfindingobject.cpp
parentc880c961bb2a0838bc529efc07cfeb12f5636d88 (diff)
parent8a330ee2eb1008951f5e5159057fa5736dd805b4 (diff)
merge 3.5.0-release
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));
}
}