diff options
| author | William Todd Stinson <stinson@lindenlab.com> | 2012-12-17 14:16:47 -0800 |
|---|---|---|
| committer | William Todd Stinson <stinson@lindenlab.com> | 2012-12-17 14:16:47 -0800 |
| commit | 09163617c2c5e79d8e51b5ceca5b5282effcb1f6 (patch) | |
| tree | 00ca15b9d3f3c336ac357413c38f87028ba4e1ee /indra/newview/llvoicevivox.cpp | |
| parent | e8bff548ff7374c263c2bc38a337e8841bc2761f (diff) | |
| parent | ed52792396c76ead787207b7a7dc3968f4352a1d (diff) | |
Pull and merge from ssh://stinson@hg.lindenlab.com/richard/viewer-chui.
Diffstat (limited to 'indra/newview/llvoicevivox.cpp')
| -rw-r--r-- | indra/newview/llvoicevivox.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llvoicevivox.cpp b/indra/newview/llvoicevivox.cpp index 6fdda12a1c..cd93b3da28 100644 --- a/indra/newview/llvoicevivox.cpp +++ b/indra/newview/llvoicevivox.cpp @@ -2668,7 +2668,7 @@ void LLVivoxVoiceClient::checkFriend(const LLUUID& id) // *NOTE: For now, we feed legacy names to Vivox because I don't know // if their service can support a mix of new and old clients with // different sorts of names. - std::string name = av_name.getUserName(); + std::string name = av_name.getAccountName(); const LLRelationship* relationInfo = LLAvatarTracker::instance().getBuddyInfo(id); bool canSeeMeOnline = false; |