diff options
| author | Todd Stinson <stinson@lindenlab.com> | 2012-07-27 15:38:03 -0700 |
|---|---|---|
| committer | Todd Stinson <stinson@lindenlab.com> | 2012-07-27 15:38:03 -0700 |
| commit | c1aa0cc4fcd4642a7849b0b56dd1b777536e4f92 (patch) | |
| tree | 921c8ee2c4ae29210b9c59cdaef01f9c9388be01 /indra/newview/llstartup.cpp | |
| parent | 0479e8d4ad1212b0028805cd4e39b6fe593b86c7 (diff) | |
| parent | ca7b9a944b164602cd8b11bf6512f790743964f3 (diff) | |
Pull and merge from ssh://stinson@hg.lindenlab.com/richard/viewer-chui/.
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 0b70184920..68b4063df9 100644 --- a/indra/newview/llstartup.cpp +++ b/indra/newview/llstartup.cpp @@ -94,6 +94,7 @@ #include "llcallingcard.h" #include "llconsole.h" #include "llcontainerview.h" +#include "llconversationlog.h" #include "lldebugview.h" #include "lldrawable.h" #include "lleventnotifier.h" @@ -1268,6 +1269,8 @@ bool idle_startup() display_startup(); LLStartUp::setStartupState( STATE_MULTIMEDIA_INIT ); + LLConversationLog::getInstance(); + return FALSE; } |