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/llwaterparammanager.cpp
+++ b/indra/newview/llwaterparammanager.cpp
@@ -588,7 +588,10 @@ void LLWaterParamManager::initSingleton()

 	loadAllPresets();

-	LLEnvManagerNew::instance().usePrefs();
+	// This shouldn't be called here. It has nothing to do with the initialization of this singleton.
+	// Instead, call it one-time when the viewer starts. Calling it here causes a recursive entry
+	// of LLWaterParamManager::initSingleton().
+	//LLEnvManagerNew::instance().usePrefs();
 }

 // static