From 8b12e58a0db05d33d612aeb2350fb888baaa9869 Mon Sep 17 00:00:00 2001
From: Cinders <cinder.roxley@phoenixviewer.com>
Date: Sat, 29 Jun 2013 21:41:13 -0600
Subject: [PATCH] Fix build in llstartup.cpp

---
 indra/newview/llstartup.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

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:CR> [FS communication UI] [CHUI Merge] We don't have a conversation log yet
+		//LLConversationLog::getInstance();
 
 		return FALSE;
 	}