diff options
| author | Merov Linden <merov@lindenlab.com> | 2012-08-23 20:02:43 -0700 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2012-08-23 20:02:43 -0700 |
| commit | b19e6c295972c83a2637a29007bc5d0a92711ea9 (patch) | |
| tree | b9df565b6ec84ff6c55097431392ec792a6dc0cb /indra/llui/tests/llurlentry_stub.cpp | |
| parent | e537d6477dfa1eea86dc16c767b793fb530d1ebc (diff) | |
| parent | 6d84272d38a4d09819ae03f4d967195ec3bd660b (diff) | |
Pull merge from richard/viewer-chui
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 ee87d01239..f8797fd257 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() |