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/llviewershadermgr.cpp

@@ -537,6 +537,10 @@ void LLViewerShaderMgr::setShaders()
 	{
 		gViewerWindow->setCursor(UI_CURSOR_ARROW);
 	}
+
+	LLWaterParamManager::instance()->updateShaderLinks();
+	LLWLParamManager::instance()->updateShaderLinks();
+
 	gPipeline.createGLBuffers();
 	reentrance = false;
 }