diff options
| author | Rider Linden <rider@lindenlab.com> | 2018-10-29 23:05:16 +0000 |
|---|---|---|
| committer | Rider Linden <rider@lindenlab.com> | 2018-10-29 23:05:16 +0000 |
| commit | 2ee1f40411a9036c8d9d4d6cb6f9b75dead61315 (patch) | |
| tree | 6d74d11ed7904ce0ec56602ac6a000a2ba6db489 /indra/newview/llenvironment.h | |
| parent | 536799d07e4298ff8157ef51ed00040e10a5ba65 (diff) | |
| parent | 659d14504f6ab4ad283efe4ecd950a4483e1498f (diff) | |
Merged in andreykproductengine/maint-eep (pull request #169)
SL-1476 EEP Better shader resets and transitions
Approved-by: Graham Madarasz <graham@lindenlab.com>
Diffstat (limited to 'indra/newview/llenvironment.h')
| -rw-r--r-- | indra/newview/llenvironment.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llenvironment.h b/indra/newview/llenvironment.h index 31c9d290be..63020ab5d7 100644 --- a/indra/newview/llenvironment.h +++ b/indra/newview/llenvironment.h @@ -124,7 +124,7 @@ public: void update(const LLViewerCamera * cam); - void updateGLVariablesForSettings(LLGLSLShader *shader, const LLSettingsBase::ptr_t &psetting); + static void updateGLVariablesForSettings(LLGLSLShader *shader, const LLSettingsBase::ptr_t &psetting); void updateShaderUniforms(LLGLSLShader *shader); void setSelectedEnvironment(EnvSelection_t env, LLSettingsBase::Seconds transition = TRANSITION_DEFAULT, bool forced = false); |