Fix recursive calls to LLWaterParamManager::initSingleton and LLWLParamManager::initSingleton

2013-03-19 22:44:01 +01:00
parent fc642019b3
commit 06730d1a7e
4 changed files with 23 additions and 4 deletions
--- a/indra/newview/llappviewer.cpp
+++ b/indra/newview/llappviewer.cpp
@@ -992,6 +992,11 @@ bool LLAppViewer::init()

 	LLViewerJoystick::getInstance()->init(false);

+	// Finish windlight initialization.
+	LLWLParamManager::instance().initHack();
+	// Use prefered Environment.
+	LLEnvManagerNew::instance().usePrefs();
+
 	gGLActive = FALSE;
 	return true;
 }