diff options
| author | Ptolemy <ptolemy@lindenlab.com> | 2021-10-29 15:11:42 -0700 |
|---|---|---|
| committer | Ptolemy <ptolemy@lindenlab.com> | 2021-10-29 15:11:42 -0700 |
| commit | 1be8a8d10bd3542b0b5c2943a508509c5cfcf3ef (patch) | |
| tree | a4bd2bdddb24ae0b443878b0337e77787d3fea40 /indra/newview/llsettingsvo.cpp | |
| parent | 61bca72d37f695ee15897ddc3b9215c969ecf648 (diff) | |
| parent | 68b75be652575ff301172b7b19522d4f0494bdf0 (diff) | |
Fix merge conflict
Diffstat (limited to 'indra/newview/llsettingsvo.cpp')
| -rw-r--r-- | indra/newview/llsettingsvo.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/indra/newview/llsettingsvo.cpp b/indra/newview/llsettingsvo.cpp index 6a88a8ef2c..0c59de5ea0 100644 --- a/indra/newview/llsettingsvo.cpp +++ b/indra/newview/llsettingsvo.cpp @@ -666,6 +666,7 @@ void LLSettingsVOSky::updateSettings() void LLSettingsVOSky::applySpecial(void *ptarget, bool force) { + LL_PROFILE_ZONE_SCOPED LLVector4 light_direction = LLEnvironment::instance().getClampedLightNorm(); LLShaderUniforms* shader = &((LLShaderUniforms*)ptarget)[LLGLSLShader::SG_DEFAULT]; @@ -908,6 +909,8 @@ LLSD LLSettingsVOWater::convertToLegacy(const LLSettingsWater::ptr_t &pwater) //------------------------------------------------------------------------- void LLSettingsVOWater::applySpecial(void *ptarget, bool force) { + LL_PROFILE_ZONE_SCOPED + LLEnvironment& env = LLEnvironment::instance(); auto group = LLGLSLShader::SG_WATER; |