Backed out changeset ce8d4ebd2ed9 for fix from LL

indra/newview/llviewerwindow.cpp

@@ -232,10 +232,6 @@
 #include "exopostprocess.h"	// <FS:Ansariel> Exodus Vignette
 #include "llnetmap.h"
 #include "lggcontactsets.h"
-// <FS:Ansariel> Remove circular dependency of LLWLParamManager & LLWaterParamManager singletons
-#include "llwlparammanager.h"
-#include "llwaterparammanager.h"
-// </FS:Ansariel>
 
 #include "lltracerecording.h"
 
@@ -2328,13 +2324,6 @@ void LLViewerWindow::initWorldUI()
 
 	LLMenuOptionPathfindingRebakeNavmesh::getInstance()->initialize();
 
-	// <FS:Ansariel> Remove circular dependency of LLWLParamManager & LLWaterParamManager singletons
-	// LLWLParamManager & LLWaterParamManager instances will be created as part of the toolbars
-	// because of the quick prefs floater, so do it right before the toolbars get created
-	LLWLParamManager::instance().init();
-	LLWaterParamManager::instance().init();
-	// </FS:Ansariel>
-
 	// Load and make the toolbars visible
 	// Note: we need to load the toolbars only *after* the user is logged in and IW
 	if (gToolBarView)

indra/newview/llwaterparammanager.cpp

@@ -434,12 +434,6 @@ F32 LLWaterParamManager::getFogDensity(void)
 // virtual static
 void LLWaterParamManager::initSingleton()
 {
-// <FS:Ansariel> Remove circular dependency of LLWLParamManager & LLWaterParamManager singletons
-}
-
-void LLWaterParamManager::init()
-{
-// </FS:Ansariel>
 	LL_DEBUGS("Windlight") << "Initializing water" << LL_ENDL;
 	loadAllPresets();
 	LLEnvManagerNew::instance().usePrefs();

indra/newview/llwaterparammanager.h

@@ -282,9 +282,6 @@ public:
 
 	void setDensitySliderValue(F32 val);
 
-	// <FS:Ansariel> Remove circular dependency of LLWLParamManager & LLWaterParamManager singletons
-	void init();
-
 	/// getters for all the different things water param manager maintains
 	LLUUID getNormalMapID(void);
 	LLVector2 getWave1Dir(void);

indra/newview/llwlparammanager.cpp

@@ -719,12 +719,6 @@ boost::signals2::connection LLWLParamManager::setPresetListChangeCallback(const
 // virtual static
 void LLWLParamManager::initSingleton()
 {
-// <FS:Ansariel> Remove circular dependency of LLWLParamManager & LLWaterParamManager singletons
-}
-
-void LLWLParamManager::init()
-{
-// </FS:Ansariel>
 	LL_DEBUGS("Windlight") << "Initializing sky" << LL_ENDL;
 
 	loadAllPresets();

indra/newview/llwlparammanager.h

@@ -324,9 +324,6 @@ public:
 	// <FS:Ansariel> Get list of all ParamSets
 	const std::map<LLWLParamKey, LLWLParamSet>& getParamList() const { return mParamList; };
 
-	// <FS:Ansariel> Remove circular dependency of LLWLParamManager & LLWaterParamManager singletons
-	void init();
-
 	// helper variables
 	LLWLAnimator mAnimator;