diff options
| author | Don Kjer <don@lindenlab.com> | 2013-03-13 08:46:59 +0000 |
|---|---|---|
| committer | Don Kjer <don@lindenlab.com> | 2013-03-13 08:46:59 +0000 |
| commit | 662d67e3b5f1cbf5e894f0e4af37a31faacd67e3 (patch) | |
| tree | 93af533d9c1e9c027c5abc56a5de4ee207591b23 /indra/newview/llgroupactions.cpp | |
| parent | f945415210f0e18c2c6d941fda6b7d45cb0f06f1 (diff) | |
| parent | 0ebcdce82bffae18459ed541f05906f625ef47e2 (diff) | |
Merging LLCURL::Responder changes with CHUI changes. Fixed gcc 4.6 compile failures
Diffstat (limited to 'indra/newview/llgroupactions.cpp')
| -rw-r--r-- | indra/newview/llgroupactions.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llgroupactions.cpp b/indra/newview/llgroupactions.cpp index 623ebb76f2..a0f2918bd7 100644 --- a/indra/newview/llgroupactions.cpp +++ b/indra/newview/llgroupactions.cpp @@ -36,10 +36,10 @@ #include "llfloaterreg.h" #include "llfloatersidepanelcontainer.h" #include "llgroupmgr.h" +#include "llfloaterimcontainer.h" #include "llimview.h" // for gIMMgr #include "llnotificationsutil.h" #include "llstatusbar.h" // can_afford_transaction() -#include "llimfloater.h" #include "groupchatlistener.h" // @@ -335,7 +335,7 @@ LLUUID LLGroupActions::startIM(const LLUUID& group_id) group_id); if (session_id != LLUUID::null) { - LLIMFloater::show(session_id); + LLFloaterIMContainer::getInstance()->showConversation(session_id); } make_ui_sound("UISndStartIM"); return session_id; |