diff options
| author | Alexei Arabadji <aarabadji@productengine.com> | 2009-11-06 19:31:45 +0200 |
|---|---|---|
| committer | Alexei Arabadji <aarabadji@productengine.com> | 2009-11-06 19:31:45 +0200 |
| commit | 8f679595d5cbcc29a5c9576b04df034aa0c2157f (patch) | |
| tree | 48bbde155d34027fae238a5a17691901c9ad3ad7 /indra/newview/llavataractions.cpp | |
| parent | 01c83aa21e616777adf9e1ab0319f95e656e4f7a (diff) | |
| parent | 8a4e36a9bdd94ebd183d1f315aa51c6c52d0abbd (diff) | |
Automated merge with https://hg.aws.productengine.com/secondlife/viewer-2-0/
--HG--
branch : product-engine
Diffstat (limited to 'indra/newview/llavataractions.cpp')
| -rw-r--r-- | indra/newview/llavataractions.cpp | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/indra/newview/llavataractions.cpp b/indra/newview/llavataractions.cpp index 67ffe54b7e..3fc37aa3d5 100644 --- a/indra/newview/llavataractions.cpp +++ b/indra/newview/llavataractions.cpp @@ -178,7 +178,10 @@ void LLAvatarActions::startIM(const LLUUID& id) std::string name; gCacheName->getFullName(id, name); LLUUID session_id = gIMMgr->addSession(name, IM_NOTHING_SPECIAL, id); - LLIMFloater::show(session_id); + if (session_id != LLUUID::null) + { + LLIMFloater::show(session_id); + } make_ui_sound("UISndStartIM"); } @@ -191,7 +194,11 @@ void LLAvatarActions::startConference(const std::vector<LLUUID>& ids) { id_array.push_back(*it); } - gIMMgr->addSession("Friends Conference", IM_SESSION_CONFERENCE_START, ids[0], id_array); + LLUUID session_id = gIMMgr->addSession("Friends Conference", IM_SESSION_CONFERENCE_START, ids[0], id_array); + if (session_id != LLUUID::null) + { + LLIMFloater::show(session_id); + } make_ui_sound("UISndStartIM"); } |