diff options
| author | Steve Bennetts <steve@lindenlab.com> | 2009-11-06 18:13:38 -0800 |
|---|---|---|
| committer | Steve Bennetts <steve@lindenlab.com> | 2009-11-06 18:13:38 -0800 |
| commit | 86314438477815eeac17de17799a5e0c0b7d874e (patch) | |
| tree | 139f80ec0c6f12538b115677be890a816b60c98e /indra/newview/llviewermenu.cpp | |
| parent | 5e85642650d4ffa822b749c5a4a211531545d660 (diff) | |
| parent | 9c55ff93903d19b22dec63a6db26e9ec3436fbf5 (diff) | |
merge changes from 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 a3b119456b..07d073c3a9 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; @@ -6260,9 +6261,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; } |