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(); // 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 // // -//-TT Client LSL Bridge + // Client LSL Bridge if (gSavedSettings.getBOOL("UseLSLBridge")) + { FSLSLBridge::instance().initBridge(); -//-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 communication UI] - //FSFloaterIM::initIMFloater(); CHUI Merge LL removed this, check if still needed + FSFloaterIM::initIMFloater(); // [FS communication UI] display_startup();