Merge branch 'future' of https://github.com/Shyotl/SingularityViewer

2012-08-16 03:37:50 +02:00
parent 41c4eabcaa d6b470cd07
commit 0b953ccc40
1 changed files with 1 additions and 0 deletions
--- a/indra/newview/llviewershadermgr.cpp
+++ b/indra/newview/llviewershadermgr.cpp
@@ -599,6 +599,7 @@ void LLViewerShaderMgr::setShaders()
 	LLWaterParamManager::getInstance()->updateShaderLinks();
 	LLWLParamManager::getInstance()->updateShaderLinks();

+	gPipeline.refreshCachedSettings();
 	gPipeline.createGLBuffers();

 	reentrance = false;