diff options
| author | Rick Pasetto <rick@lindenlab.com> | 2009-11-05 17:50:32 -0800 |
|---|---|---|
| committer | Rick Pasetto <rick@lindenlab.com> | 2009-11-05 17:50:32 -0800 |
| commit | 8c44fac93ffce1a41d84f1d6e98891a50ab1dbab (patch) | |
| tree | aca14bb3256b6dd4c1a7a342d36f2cc989159f41 /indra/newview/llavataractions.cpp | |
| parent | 1712265901da8ba65f2a9ae3e903372fafacd268 (diff) | |
| parent | e654475529d924603a9b3bc8c4775c86d3cf7933 (diff) | |
merge from remote repo
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"); } |