Parammanagers are really not done well. Added manager-specific shader lists instead of just having them dig down the global list every update.

indra/newview/llwaterparammanager.h

@@ -225,6 +225,8 @@ public:
 	LLWaterParamManager();
 	~LLWaterParamManager();
 
+	void updateShaderLinks();
+
 	/// load a preset file
 	void loadAllPresets(const std::string & fileName);
 
@@ -319,6 +321,7 @@ public:
 private:
 	LLVector4 mWaterPlane;
 	F32 mWaterFogKS;
+	std::vector<LLGLSLShader *> mShaderList;
 
 	// our parameter manager singleton instance
 	static LLWaterParamManager * sInstance;