diff options
| author | brad kittenbrink <brad@lindenlab.com> | 2009-09-01 18:16:04 -0400 |
|---|---|---|
| committer | brad kittenbrink <brad@lindenlab.com> | 2009-09-01 18:16:04 -0400 |
| commit | 0f0853a6fe23c6eb4341d6a5a0752e224cdf1b22 (patch) | |
| tree | 701f4dc5ecd3fc0b9b5f6aec30b0b29134754a2a /indra/newview/llvoiceclient.cpp | |
| parent | f4f02f0f34d5a26472ea4a6c681a380a2174d1bd (diff) | |
Fix up some more post-merge breakage.
Diffstat (limited to 'indra/newview/llvoiceclient.cpp')
| -rw-r--r-- | indra/newview/llvoiceclient.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llvoiceclient.cpp b/indra/newview/llvoiceclient.cpp index 182850f326..746dc99e35 100644 --- a/indra/newview/llvoiceclient.cpp +++ b/indra/newview/llvoiceclient.cpp @@ -6920,8 +6920,8 @@ void LLVoiceClient::notifyFriendObservers() void LLVoiceClient::lookupName(const LLUUID &id) { - gCacheName->get(id, FALSE, &LLVoiceClient::onAvatarNameLookup); - gCacheName->getNameFromUUID(id, is_group, onAvatarNameLookup); + BOOL is_group = FALSE; + gCacheName->get(id, is_group, &LLVoiceClient::onAvatarNameLookup); } //static |