summaryrefslogtreecommitdiff
path: root/indra/llmessage/llavatarnamecache.h
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2012-08-16 21:27:50 -0400
committerOz Linden <oz@lindenlab.com>2012-08-16 21:27:50 -0400
commita0be18bd2e268f692e781d376be7bef4e71e46fb (patch)
tree6e43af94f76e524c9d0556b1801d870d75231963 /indra/llmessage/llavatarnamecache.h
parent75a3183ad778cf2b7e2ed343345a82e3c0202ab0 (diff)
parent331a76afaaed8f802cf8c313eed8a287e75e93fc (diff)
merge changes for DRTVWR-197
Diffstat (limited to 'indra/llmessage/llavatarnamecache.h')
-rw-r--r--indra/llmessage/llavatarnamecache.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/llmessage/llavatarnamecache.h b/indra/llmessage/llavatarnamecache.h
index 59c1329ffa..064942fe53 100644
--- a/indra/llmessage/llavatarnamecache.h
+++ b/indra/llmessage/llavatarnamecache.h
@@ -71,10 +71,11 @@ namespace LLAvatarNameCache
void (const LLUUID& agent_id, const LLAvatarName& av_name)>
callback_signal_t;
typedef callback_signal_t::slot_type callback_slot_t;
+ typedef boost::signals2::connection callback_connection_t;
// Fetches name information and calls callback.
// If name information is in cache, callback will be called immediately.
- void get(const LLUUID& agent_id, callback_slot_t slot);
+ callback_connection_t get(const LLUUID& agent_id, callback_slot_t slot);
// Allow display names to be explicitly disabled for testing.
void setUseDisplayNames(bool use);