diff options
author | palange <palange@lindenlab.com> | 2009-11-05 17:54:51 -0800 |
---|---|---|
committer | palange <palange@lindenlab.com> | 2009-11-05 17:54:51 -0800 |
commit | 4ead03acd094d8418f9fe0f883e776ce8b209722 (patch) | |
tree | 1ae53248e9a643c9f27333aabc31ff0291e59b45 /indra/newview/llavataractions.cpp | |
parent | ec32310c8602bf4dc69ed27e8c177cbd32c24411 (diff) | |
parent | 81192236ac44ea500ea6ec6f8de32be11e9165ca (diff) |
merge to viewer-2-0
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"); } |