diff options
| author | Steve Bennetts <steve@lindenlab.com> | 2009-11-05 11:41:25 -0800 |
|---|---|---|
| committer | Steve Bennetts <steve@lindenlab.com> | 2009-11-05 11:41:25 -0800 |
| commit | 98229cbbcf780a916474bdd789a8437461bcaa3b (patch) | |
| tree | 0e281cf99c7b2245d33f1aa20b0e34b555071724 /indra/newview/llavataractions.cpp | |
| parent | b1242ead82c80628a9155cd0eb05f5ff2378af4b (diff) | |
| parent | daf3adc4ae349cf37b4b1d7caee1268a3febb430 (diff) | |
Merge from https://hg.aws.productengine.com/secondlife/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"); } |