diff options
| author | Igor Borovkov <iborovkov@productengine.com> | 2010-02-10 13:04:18 +0200 |
|---|---|---|
| committer | Igor Borovkov <iborovkov@productengine.com> | 2010-02-10 13:04:18 +0200 |
| commit | 3d8caa79a71e890cf799f7f99a80980f662329c3 (patch) | |
| tree | 725d1f68cc1b04e70e9e8171d4f7ac27f8c7d1b0 | |
| parent | 8288530c45616a37dc7eef0b517b4383d3404ea6 (diff) | |
fixed waiting bug for EXT-4976 IM Window with 'Show End of Last Conversation' turned on, doesnt show Avatar name, or correct information
--HG--
branch : product-engine
| -rw-r--r-- | indra/newview/llavataractions.cpp | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/indra/newview/llavataractions.cpp b/indra/newview/llavataractions.cpp index bd987eac77..1d75374930 100644 --- a/indra/newview/llavataractions.cpp +++ b/indra/newview/llavataractions.cpp @@ -181,7 +181,12 @@ void LLAvatarActions::startIM(const LLUUID& id) return; std::string name; - gCacheName->getFullName(id, name); + if (!gCacheName->getFullName(id, name)) + { + gCacheName->get(id, FALSE, boost::bind(&LLAvatarActions::startIM, id)); + return; + } + LLUUID session_id = gIMMgr->addSession(name, IM_NOTHING_SPECIAL, id); if (session_id != LLUUID::null) { |