diff options
author | Rider Linden <rider@lindenlab.com> | 2017-10-13 17:17:49 -0700 |
---|---|---|
committer | Rider Linden <rider@lindenlab.com> | 2017-10-13 17:17:49 -0700 |
commit | cc22ffc6d799544e8f2a9dfed6813081d908c88d (patch) | |
tree | 0b02af15c41104fb253cd7a9e705fa1f3f9fd829 /indra/newview/llviewershadermgr.cpp | |
parent | e4b035d0cd3eaa76fd82643c17e3631c67387a54 (diff) |
Watter settings active and start of new joystick button type.
Diffstat (limited to 'indra/newview/llviewershadermgr.cpp')
-rw-r--r-- | indra/newview/llviewershadermgr.cpp | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/indra/newview/llviewershadermgr.cpp b/indra/newview/llviewershadermgr.cpp index 683ff7558a..f0924486df 100644 --- a/indra/newview/llviewershadermgr.cpp +++ b/indra/newview/llviewershadermgr.cpp @@ -3430,7 +3430,6 @@ std::string LLViewerShaderMgr::getShaderDirPrefix(void) void LLViewerShaderMgr::updateShaderUniforms(LLGLSLShader * shader) { LLEnvironment::instance().updateShaderUniforms(shader); - LLWaterParamManager::getInstance()->updateShaderUniforms(shader); } LLViewerShaderMgr::shader_iter LLViewerShaderMgr::beginShaders() const |