summaryrefslogtreecommitdiff
path: root/indra/llui
diff options
context:
space:
mode:
authorTodd Stinson <stinson@lindenlab.com>2012-08-13 16:55:51 -0700
committerTodd Stinson <stinson@lindenlab.com>2012-08-13 16:55:51 -0700
commit7cbbdbd896d1e54d2d54cb4ec1ed5bd14491a629 (patch)
treec41167ff97919de923750a1479a39b4caea5efd5 /indra/llui
parent1ace064a58daf5bc493ae1fe5a9180db89ea52dc (diff)
PATH-849: CRASHFIX This should fix the crash caused by LLPathfindingObject::handleAvatarNameFetch being called after the corresponding LLPathfindingObject has been deleted.
Diffstat (limited to 'indra/llui')
-rw-r--r--indra/llui/tests/llurlentry_stub.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/indra/llui/tests/llurlentry_stub.cpp b/indra/llui/tests/llurlentry_stub.cpp
index cb3b7abb14..74ed72ef97 100644
--- a/indra/llui/tests/llurlentry_stub.cpp
+++ b/indra/llui/tests/llurlentry_stub.cpp
@@ -40,9 +40,10 @@ bool LLAvatarNameCache::get(const LLUUID& agent_id, LLAvatarName *av_name)
return false;
}
-void LLAvatarNameCache::get(const LLUUID& agent_id, callback_slot_t slot)
+LLAvatarNameCache::callback_connection_t LLAvatarNameCache::get(const LLUUID& agent_id, callback_slot_t slot)
{
- return;
+ callback_connection_t connection;
+ return connection;
}
bool LLAvatarNameCache::useDisplayNames()