diff options
| author | skolb <none@none> | 2009-12-03 09:18:11 -0800 |
|---|---|---|
| committer | skolb <none@none> | 2009-12-03 09:18:11 -0800 |
| commit | 7851819c88e8049c1c3d07d279d479c53d5de777 (patch) | |
| tree | e8c81e110a71427b64e0b34f4351e7acf44465f3 /indra/newview/llstartup.cpp | |
| parent | 9b17e6710b713fa12f6db7d6f51d97e4052a0835 (diff) | |
| parent | 57b68d9bfe25fc7b9efe41a9fa30935c156acb34 (diff) | |
local merge
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; } |