diff options
| author | Steve Bennetts <steve@lindenlab.com> | 2009-11-06 18:13:38 -0800 |
|---|---|---|
| committer | Steve Bennetts <steve@lindenlab.com> | 2009-11-06 18:13:38 -0800 |
| commit | 86314438477815eeac17de17799a5e0c0b7d874e (patch) | |
| tree | 139f80ec0c6f12538b115677be890a816b60c98e /indra/newview/llinventorypanel.cpp | |
| parent | 5e85642650d4ffa822b749c5a4a211531545d660 (diff) | |
| parent | 9c55ff93903d19b22dec63a6db26e9ec3436fbf5 (diff) | |
merge changes from 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 0a13d819a5..7f69ce9641 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;
}
|