diff options
| author | Alexei Arabadji <aarabadji@productengine.com> | 2009-11-06 19:31:45 +0200 |
|---|---|---|
| committer | Alexei Arabadji <aarabadji@productengine.com> | 2009-11-06 19:31:45 +0200 |
| commit | 8f679595d5cbcc29a5c9576b04df034aa0c2157f (patch) | |
| tree | 48bbde155d34027fae238a5a17691901c9ad3ad7 /indra/newview/llinventorypanel.cpp | |
| parent | 01c83aa21e616777adf9e1ab0319f95e656e4f7a (diff) | |
| parent | 8a4e36a9bdd94ebd183d1f315aa51c6c52d0abbd (diff) | |
Automated merge with https://hg.aws.productengine.com/secondlife/viewer-2-0/
--HG--
branch : product-engine
Diffstat (limited to 'indra/newview/llinventorypanel.cpp')
| -rw-r--r-- | indra/newview/llinventorypanel.cpp | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/indra/newview/llinventorypanel.cpp b/indra/newview/llinventorypanel.cpp index 178e7d0823..80710610d4 100644 --- a/indra/newview/llinventorypanel.cpp +++ b/indra/newview/llinventorypanel.cpp @@ -86,6 +86,7 @@ #include "llviewerwindow.h" #include "llvoavatarself.h" #include "llwearablelist.h" +#include "llimfloater.h" static LLDefaultChildRegistry::Register<LLInventoryPanel> r("inventory_panel"); @@ -800,7 +801,11 @@ bool LLInventoryPanel::beginIMSession() name = llformat("Session %d", session_num++); } - gIMMgr->addSession(name, type, members[0], members); + LLUUID session_id = gIMMgr->addSession(name, type, members[0], members); + if (session_id != LLUUID::null) + { + LLIMFloater::show(session_id); + } return true; } |