diff options
| author | Don Kjer <don@lindenlab.com> | 2012-09-03 20:12:47 +0000 |
|---|---|---|
| committer | Don Kjer <don@lindenlab.com> | 2012-09-03 20:12:47 +0000 |
| commit | 403d1b6404355fa26b0bfeff206f5c56758a491c (patch) | |
| tree | 6438eb8fa29dc8946d404ac79f89cf1bd140bbe1 /indra/llui/tests | |
| parent | 21c364c4d455cc05ec176032e8c090be0cc4ed50 (diff) | |
| parent | 825cc7873251ad90720ab40221d689abed7b2ac8 (diff) | |
Merge VirLinden/sunshine -> don_linden/sunshine-experimental
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() |