diff options
| author | Graham Linden <graham@lindenlab.com> | 2018-10-30 00:23:22 +0100 |
|---|---|---|
| committer | Graham Linden <graham@lindenlab.com> | 2018-10-30 00:23:22 +0100 |
| commit | f334453af1cb2e7085cbe72da4fee357afceb80f (patch) | |
| tree | 666447d52ffa8fb7bc6db8a7e14995897e47d8b5 /indra/newview/llenvironment.h | |
| parent | 38a6f3b0dfd56ceb09bc5a689a678038f8022603 (diff) | |
| parent | 2ee1f40411a9036c8d9d4d6cb6f9b75dead61315 (diff) | |
Merge
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); |