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/llui/tests/llurlentry_stub.cpp | |
| parent | 7204593ec3f6fca63c32bcb8cdcf9c356165d24e (diff) | |
| parent | 2d28bc112a2db73b521d44e12b3c633cf8eccd7e (diff) | |
merge back beta fixes
Diffstat (limited to 'indra/llui/tests/llurlentry_stub.cpp')
| -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() |