diff options
| author | Oz Linden <oz@lindenlab.com> | 2012-08-16 21:27:50 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2012-08-16 21:27:50 -0400 |
| commit | a0be18bd2e268f692e781d376be7bef4e71e46fb (patch) | |
| tree | 6e43af94f76e524c9d0556b1801d870d75231963 /indra/llui | |
| parent | 75a3183ad778cf2b7e2ed343345a82e3c0202ab0 (diff) | |
| parent | 331a76afaaed8f802cf8c313eed8a287e75e93fc (diff) | |
merge changes for DRTVWR-197
Diffstat (limited to 'indra/llui')
| -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() |