diff options
| author | Steve Bennetts <steve@lindenlab.com> | 2009-11-05 13:31:38 -0800 |
|---|---|---|
| committer | Steve Bennetts <steve@lindenlab.com> | 2009-11-05 13:31:38 -0800 |
| commit | b286744a368d2a492bd9a3446fb8d072bd9ee8cd (patch) | |
| tree | ec00b869367187831e097b0a406e193cb2e0832a /indra/newview/llavataractions.cpp | |
| parent | 6ce9f3b047084a9b947f66d041645238feb4b09b (diff) | |
| parent | e26dacb374ec0fd87679aa730cf937a44bab3628 (diff) | |
Merge
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"); } |