diff options
| author | Oz Linden <oz@lindenlab.com> | 2012-08-20 14:45:47 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2012-08-20 14:45:47 -0400 |
| commit | c2e902d56ac5d6b6109c1b12254c62ec18ad2199 (patch) | |
| tree | eccb10bb1f2a558270fef9faa87ef1333e2f501a /indra/llmessage/llavatarnamecache.h | |
| parent | 7204593ec3f6fca63c32bcb8cdcf9c356165d24e (diff) | |
| parent | 2d28bc112a2db73b521d44e12b3c633cf8eccd7e (diff) | |
merge back beta fixes
Diffstat (limited to 'indra/llmessage/llavatarnamecache.h')
| -rw-r--r-- | indra/llmessage/llavatarnamecache.h | 3 |
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); |