diff options
| author | Alexei Arabadji <aarabadji@productengine.com> | 2009-11-06 19:31:27 +0200 |
|---|---|---|
| committer | Alexei Arabadji <aarabadji@productengine.com> | 2009-11-06 19:31:27 +0200 |
| commit | 8a4e36a9bdd94ebd183d1f315aa51c6c52d0abbd (patch) | |
| tree | 6804aded3b2acfe856b2f222aebdec4923db3925 /indra/newview/llviewermenu.cpp | |
| parent | 02608052592eb47aea7c8856e85d64aec086d658 (diff) | |
fixed EXT-2295 "'Group Chat' btn makes chicklet appear only"
--HG--
branch : product-engine
Diffstat (limited to 'indra/newview/llviewermenu.cpp')
| -rw-r--r-- | indra/newview/llviewermenu.cpp | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/indra/newview/llviewermenu.cpp b/indra/newview/llviewermenu.cpp index 300ebf4e24..053a8d19e5 100644 --- a/indra/newview/llviewermenu.cpp +++ b/indra/newview/llviewermenu.cpp @@ -210,6 +210,7 @@ #include "lltexlayer.h" #include "llappearancemgr.h" +#include "llimfloater.h" using namespace LLVOAvatarDefines; @@ -6265,9 +6266,13 @@ class LLAvatarSendIM : public view_listener_t //EInstantMessage type = have_agent_callingcard(gLastHitObjectID) // ? IM_SESSION_ADD : IM_SESSION_CARDLESS_START; - gIMMgr->addSession(name, + LLUUID session_id = gIMMgr->addSession(name, IM_NOTHING_SPECIAL, avatar->getID()); + if (session_id != LLUUID::null) + { + LLIMFloater::show(session_id); + } } return true; } |