diff --git a/indra/newview/llstartup.cpp b/indra/newview/llstartup.cpp index 537227339e..92febdbf5f 100644 --- a/indra/newview/llstartup.cpp +++ b/indra/newview/llstartup.cpp @@ -1603,7 +1603,8 @@ LLWorld::getInstance()->addRegion(gFirstSimHandle, gFirstSim, first_sim_size_x, display_startup(); LLStartUp::setStartupState( STATE_MULTIMEDIA_INIT ); - LLConversationLog::getInstance(); + // [FS communication UI] [CHUI Merge] We don't have a conversation log yet + //LLConversationLog::getInstance(); return FALSE; }