summaryrefslogtreecommitdiff
path: root/indra/newview/llstartup.cpp
diff options
context:
space:
mode:
authorDmitry Zaporozhan <dzaporozhan@productengine.com>2009-12-02 14:18:40 +0200
committerDmitry Zaporozhan <dzaporozhan@productengine.com>2009-12-02 14:18:40 +0200
commit9d8b189886ae14800d58f9729d8c8ea9b338ed52 (patch)
tree70bbfd2ed96710569bae959f6d1ac480f08919da /indra/newview/llstartup.cpp
parent52ce4b922947579337226d7932bcd6ffb931da82 (diff)
Implemented normal sub-task EXT-2975 - Make the IM multifloater optional.
--HG-- branch : product-engine
Diffstat (limited to 'indra/newview/llstartup.cpp')
-rw-r--r--indra/newview/llstartup.cpp3
1 files changed, 3 insertions, 0 deletions
diff --git a/indra/newview/llstartup.cpp b/indra/newview/llstartup.cpp
index db8bda008e..7f68c2e8f4 100644
--- a/indra/newview/llstartup.cpp
+++ b/indra/newview/llstartup.cpp
@@ -59,6 +59,7 @@
#include "llfloaterreg.h"
#include "llfocusmgr.h"
#include "llhttpsender.h"
+#include "llimfloater.h"
#include "lllocationhistory.h"
#include "llimageworker.h"
#include "llloginflags.h"
@@ -2085,6 +2086,8 @@ bool idle_startup()
LLAgentPicksInfo::getInstance()->requestNumberOfPicks();
+ LLIMFloater::initIMFloater();
+
return TRUE;
}