diff options
| author | Alexei Arabadji <aarabadji@productengine.com> | 2009-11-05 18:26:38 +0200 |
|---|---|---|
| committer | Alexei Arabadji <aarabadji@productengine.com> | 2009-11-05 18:26:38 +0200 |
| commit | 8ada3c0a532ae8e2742244f5f1ec5bae6081c73f (patch) | |
| tree | b8f13780f4f3d58eff1bdfddc36a375fb53685ec /indra/newview/llavataractions.cpp | |
| parent | a82ab8690f03f8571e536aa2a3a29e5f653e230e (diff) | |
| parent | aa29e39a44458db51cad20eca03be406e4d249f0 (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"); } |