diff options
| author | Gilbert Gonzales <gilbert@lindenlab.com> | 2012-11-28 11:37:01 -0800 |
|---|---|---|
| committer | Gilbert Gonzales <gilbert@lindenlab.com> | 2012-11-28 11:37:01 -0800 |
| commit | 26cf298024455cae7d5f45d030d12129b4a75936 (patch) | |
| tree | 808eb037166c173105c9b72e0859bd36e2448e84 /indra | |
| parent | 80f8a465eb2885246b0a1daca66077ecd1dcc61d (diff) | |
| parent | 407ee5d98fc9d856a0431cb1a39898e3805c159b (diff) | |
merging in latest changes
Diffstat (limited to 'indra')
| -rwxr-xr-x | indra/newview/llavataractions.cpp | 2 | ||||
| -rw-r--r-- | indra/newview/llvoicevivox.cpp | 6 |
2 files changed, 3 insertions, 5 deletions
diff --git a/indra/newview/llavataractions.cpp b/indra/newview/llavataractions.cpp index f5d8998ce5..1969a0bc5f 100755 --- a/indra/newview/llavataractions.cpp +++ b/indra/newview/llavataractions.cpp @@ -215,7 +215,7 @@ void LLAvatarActions::endIM(const LLUUID& id) static void on_avatar_name_cache_start_call(const LLUUID& agent_id, const LLAvatarName& av_name) { - std::string name = av_name.getCompleteName(); + std::string name = av_name.mDisplayName; LLUUID session_id = gIMMgr->addSession(name, IM_NOTHING_SPECIAL, agent_id, true); if (session_id != LLUUID::null) { diff --git a/indra/newview/llvoicevivox.cpp b/indra/newview/llvoicevivox.cpp index 3a26f14772..37491e5b58 100644 --- a/indra/newview/llvoicevivox.cpp +++ b/indra/newview/llvoicevivox.cpp @@ -6200,10 +6200,8 @@ void LLVivoxVoiceClient::lookupName(const LLUUID &id) void LLVivoxVoiceClient::onAvatarNameCache(const LLUUID& agent_id, const LLAvatarName& av_name) { - // For Vivox, we use the legacy name because I'm uncertain whether or - // not their service can tolerate switching to Username or Display Name - std::string legacy_name = av_name.getLegacyName(); - avatarNameResolved(agent_id, legacy_name); + std::string display_name = av_name.mDisplayName; + avatarNameResolved(agent_id, display_name); } void LLVivoxVoiceClient::avatarNameResolved(const LLUUID &id, const std::string &name) |