diff options
author | Richard Linden <none@none> | 2013-06-05 19:08:35 -0700 |
---|---|---|
committer | Richard Linden <none@none> | 2013-06-05 19:08:35 -0700 |
commit | 702bd5107a71aa3ac7c779a1e2ff0eaa53161e13 (patch) | |
tree | feca9cc804b88e4f1b78a811ae7af359c67e5455 /indra/newview/llpathfindingobject.cpp | |
parent | 6cf85d1bf3eae2d2d798b756100c048ec2b1c411 (diff) | |
parent | e1d96d72692d70f7e16fb93d6ef1d42c89d26409 (diff) |
Automated merge with ssh://hg.lindenlab.com/richard/viewer-interesting
Diffstat (limited to 'indra/newview/llpathfindingobject.cpp')
-rwxr-xr-x[-rw-r--r--] | indra/newview/llpathfindingobject.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/indra/newview/llpathfindingobject.cpp b/indra/newview/llpathfindingobject.cpp index 858d3203c0..900763eae4 100644..100755 --- 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)); } } |