diff options
| author | Todd Stinson <stinson@lindenlab.com> | 2012-08-23 15:11:10 -0700 |
|---|---|---|
| committer | Todd Stinson <stinson@lindenlab.com> | 2012-08-23 15:11:10 -0700 |
| commit | 6d84272d38a4d09819ae03f4d967195ec3bd660b (patch) | |
| tree | f020454f9144a769081e44ee7cd4acae7042394b /indra/llui/tests/llurlentry_stub.cpp | |
| parent | ff95dd4a43fd888a9b7353abcbfa701e4844a3a5 (diff) | |
| parent | fcfc686d9c4125c7bf35fcc97cb40b18dd9a4fc1 (diff) | |
Pull and merge from ssh://hg@bitbucket.org/lindenlab/viewer-beta.
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() |