diff options
author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2012-08-22 15:49:38 -0400 |
---|---|---|
committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2012-08-22 15:49:38 -0400 |
commit | 48d9dc9a8ef0a6f4aa53fa1061463678cb9de0c7 (patch) | |
tree | 67bf6082ce2ef92e1b4e4fad326473332d0841a8 /indra/llui/tests | |
parent | 01a229ecdf466bc183ad68b130b0bb2befcc1e6a (diff) | |
parent | 63d04204a99802d3200452e101d9bb1b898be881 (diff) |
merge
Diffstat (limited to 'indra/llui/tests')
-rw-r--r-- | indra/llui/tests/llurlentry_stub.cpp | 5 |
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() |