diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-02-10 14:15:02 +0000 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-02-10 14:15:02 +0000 |
| commit | 8a8304eeac03a45c27f9b83cbff8c3304d536172 (patch) | |
| tree | 97275b832beb3a0bc149a0728cb9e244e5a2f956 /indra/newview/llavataractions.cpp | |
| parent | 30f74e81dc9dc8660b8b5ceb41469373c5c92e64 (diff) | |
| parent | 2d1c1cbf3afed9b7a54de86f61a1a2d2ac3beba1 (diff) | |
PE merge
Diffstat (limited to 'indra/newview/llavataractions.cpp')
| -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) { |