diff options
| author | Alexei Arabadji <aarabadji@productengine.com> | 2009-11-05 17:44:39 +0200 |
|---|---|---|
| committer | Alexei Arabadji <aarabadji@productengine.com> | 2009-11-05 17:44:39 +0200 |
| commit | aa29e39a44458db51cad20eca03be406e4d249f0 (patch) | |
| tree | 777efa6ec059af0cf47c459005e903af6f5cde93 /indra/newview/llavataractions.cpp | |
| parent | 4254d1e0f7af0f8f00033bc0edaf74ddd7a49796 (diff) | |
| parent | 49db6cd157f5da37f962aa36ab791084c202d439 (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 | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/indra/newview/llavataractions.cpp b/indra/newview/llavataractions.cpp index 97e0aa5f46..67ffe54b7e 100644 --- a/indra/newview/llavataractions.cpp +++ b/indra/newview/llavataractions.cpp @@ -57,6 +57,7 @@ #include "llviewerobjectlist.h" #include "llviewermessage.h" // for handle_lure #include "llviewerregion.h" +#include "llimfloater.h" // static @@ -176,7 +177,8 @@ void LLAvatarActions::startIM(const LLUUID& id) std::string name; gCacheName->getFullName(id, name); - gIMMgr->addSession(name, IM_NOTHING_SPECIAL, id); + LLUUID session_id = gIMMgr->addSession(name, IM_NOTHING_SPECIAL, id); + LLIMFloater::show(session_id); make_ui_sound("UISndStartIM"); } |