diff options
| author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2009-12-03 13:35:44 -0500 |
|---|---|---|
| committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2009-12-03 13:35:44 -0500 |
| commit | a9609ae1557a70e095088e0a9b6ef5564dfdb388 (patch) | |
| tree | f0fd474461afe3857bf6472f0ae896a276af21cb /indra/newview/llstartup.cpp | |
| parent | 4fb7fd9fffde08ffad4b2fe8f5ead5e500d76419 (diff) | |
| parent | b05ebd89775792762063d3af08f0fe9ae785454a (diff) | |
merge
--HG--
branch : avatar-pipeline
Diffstat (limited to 'indra/newview/llstartup.cpp')
| -rw-r--r-- | indra/newview/llstartup.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/indra/newview/llstartup.cpp b/indra/newview/llstartup.cpp index 50c20bc98f..58df2ffb19 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; } |