diff options
| author | Christian Goetze <cg@lindenlab.com> | 2009-07-01 00:22:05 +0000 |
|---|---|---|
| committer | Christian Goetze <cg@lindenlab.com> | 2009-07-01 00:22:05 +0000 |
| commit | e588d1f28419745ee1e1ee98dc1852e0364a4088 (patch) | |
| tree | 8a3546576e0d5a8f0cf32cca68d0913f1061d523 /indra/newview/llvoiceclient.cpp | |
| parent | 5f4c09fa1f4b09126e1a16e78044c64e97828530 (diff) | |
svn merge -r125825:125901 svn+ssh://svn.lindenlab.com/svn/user/cg/qar-1654
QAR-1654 merge completed.
Diffstat (limited to 'indra/newview/llvoiceclient.cpp')
| -rw-r--r-- | indra/newview/llvoiceclient.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/llvoiceclient.cpp b/indra/newview/llvoiceclient.cpp index 94407ed08c..232885b3f6 100644 --- a/indra/newview/llvoiceclient.cpp +++ b/indra/newview/llvoiceclient.cpp @@ -6901,7 +6901,8 @@ void LLVoiceClient::notifyFriendObservers() void LLVoiceClient::lookupName(const LLUUID &id) { - gCacheName->getName(id, onAvatarNameLookup); + BOOL is_group = FALSE; + gCacheName->getNameFromUUID(id, is_group, onAvatarNameLookup); } //static |