diff options
| author | Steve Bennetts <steve@lindenlab.com> | 2009-12-02 10:50:17 -0800 |
|---|---|---|
| committer | Steve Bennetts <steve@lindenlab.com> | 2009-12-02 10:50:17 -0800 |
| commit | d550339958c14f0d7fd222a8531df639eac49e63 (patch) | |
| tree | 2adfe920202a4304fc37446fca5f9bd368995749 /indra/newview/llstartup.cpp | |
| parent | 6e1f6f015394a3f268608061c00993939c891e54 (diff) | |
| parent | 3c8f89246712d1e5391ab1bdd6bbc36a83f210d8 (diff) | |
Merge from product-engine
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; } |