From 45d8fe0fc40741c3a87c9d4caca2b1c1902bdbff Mon Sep 17 00:00:00 2001
From: Ansariel <none@none>
Date: Mon, 29 Jul 2013 11:36:05 +0200
Subject: [PATCH] FS communication UI: Re-enable initialization of IM floater
 at startup

---
 indra/newview/llstartup.cpp | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/indra/newview/llstartup.cpp b/indra/newview/llstartup.cpp
index 0547393b69..1296fc5927 100755
--- a/indra/newview/llstartup.cpp
+++ b/indra/newview/llstartup.cpp
@@ -2378,7 +2378,6 @@ LLWorld::getInstance()->addRegion(gFirstSimHandle, gFirstSim, first_sim_size_x,
 		display_startup();
 		
 		// <FS:CR> Load dynamic script library from xml
-
 		gScriptLibrary.loadLibrary(gDirUtilp->getExpandedFilename(LL_PATH_APP_SETTINGS, "scriptlibrary_lsl.xml"));
 #if OPENSIM
 		if (LLGridManager::getInstance()->isInOpenSim())
@@ -2520,10 +2519,12 @@ LLWorld::getInstance()->addRegion(gFirstSimHandle, gFirstSim, first_sim_size_x,
 #endif // OPENSIM // <FS:AW optional opensim support/>
 // </FS:AW Disable LSL bridge on opensim>
 
-//-TT Client LSL Bridge
+		// <FS:TT> Client LSL Bridge
 		if (gSavedSettings.getBOOL("UseLSLBridge"))
+		{
 			FSLSLBridge::instance().initBridge();
-//-TT
+		}
+		// </FS:TT>
 
 		// Let the map know about the inventory.
 		LLFloaterWorldMap* floater_world_map = LLFloaterWorldMap::getInstance();
@@ -2612,7 +2613,7 @@ LLWorld::getInstance()->addRegion(gFirstSimHandle, gFirstSim, first_sim_size_x,
 		LLAgentPicksInfo::getInstance()->requestNumberOfPicks();
 
 		// <FS:Ansariel> [FS communication UI]
-		//FSFloaterIM::initIMFloater(); <FS:TM> CHUI Merge LL removed this, check if still needed
+		FSFloaterIM::initIMFloater();
 		// </FS:Ansariel> [FS communication UI]
 		display_startup();