diff options
| author | Merov Linden <merov@lindenlab.com> | 2012-11-28 19:41:47 -0800 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2012-11-28 19:41:47 -0800 |
| commit | 1a9a55087248eb76330761c2f67e989135472153 (patch) | |
| tree | d18706e65e3eb5339607289daeca22689c1089e7 /indra/newview/llavataractions.cpp | |
| parent | 4da50b21d5dc49cf6b39f7c29b44c1bb869a13cd (diff) | |
| parent | 45e8926f138a2b42c5054149d3a9f6f39df29247 (diff) | |
Pull merge from richard/viewer-chui
Diffstat (limited to 'indra/newview/llavataractions.cpp')
| -rwxr-xr-x | indra/newview/llavataractions.cpp | 2 |
1 files changed, 1 insertions, 1 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) { |