diff options
| author | simon <none@none> | 2013-03-25 12:19:02 -0700 |
|---|---|---|
| committer | simon <none@none> | 2013-03-25 12:19:02 -0700 |
| commit | a976f5c217ce97c70a7e151b9a490e6a6ebf1396 (patch) | |
| tree | 8d86c9060ac05b34b1a9dfd25f03451e18dcc326 /indra/newview/llgroupactions.cpp | |
| parent | cc260a635674c56d8fab88a5cd4dd188b4c9ac9c (diff) | |
| parent | 98a82c50d539451e1931826ca75fbc01d611806d (diff) | |
Pull and merge downstream code with CHUI viewer-development by way of viewer-lion
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; |