diff options
| -rw-r--r-- | indra/newview/lldrawpoolterrain.cpp | 5 | ||||
| -rw-r--r-- | indra/newview/llsettingsvo.h | 6 |
2 files changed, 11 insertions, 0 deletions
diff --git a/indra/newview/lldrawpoolterrain.cpp b/indra/newview/lldrawpoolterrain.cpp index 9428dedbd0..33a11631fe 100644 --- a/indra/newview/lldrawpoolterrain.cpp +++ b/indra/newview/lldrawpoolterrain.cpp @@ -49,6 +49,7 @@ #include "llviewershadermgr.h" #include "llrender.h" #include "llenvironment.h" +#include "llsettingsvo.h" const F32 DETAIL_SCALE = 1.f/16.f; int DebugDetailMap = 0; @@ -347,6 +348,10 @@ void LLDrawPoolTerrain::renderFullShader() shader->uniform4fv(LLShaderMgr::OBJECT_PLANE_S, 1, tp0.mV); shader->uniform4fv(LLShaderMgr::OBJECT_PLANE_T, 1, tp1.mV); + LLSettingsWater::ptr_t pwater = LLEnvironment::instance().getCurrentWater(); + + ((LLSettingsVOWater*)pwater.get())->updateShader(shader); + // // detail texture 1 // diff --git a/indra/newview/llsettingsvo.h b/indra/newview/llsettingsvo.h index 0f4b715e44..6f105c9d61 100644 --- a/indra/newview/llsettingsvo.h +++ b/indra/newview/llsettingsvo.h @@ -40,6 +40,7 @@ class LLVFS; class LLInventoryItem; +class LLGLSLShader; //========================================================================= class LLSettingsVOBase : public LLSettingsBase @@ -101,6 +102,8 @@ public: bool isAdvanced() const { return m_isAdvanced; } + virtual void updateShader(LLGLSLShader* shader) { applySpecial(shader); } + protected: LLSettingsVOSky(); @@ -132,6 +135,9 @@ public: static ptr_t buildFromLegacyPresetFile(const std::string &name, const std::string &path, LLSD &messages); static LLSD convertToLegacy(const ptr_t &); + + virtual void updateShader(LLGLSLShader* shader) { applySpecial(shader); } + protected: LLSettingsVOWater(); |