diff options
| author | Graham Linden <graham@lindenlab.com> | 2018-10-10 18:44:03 +0100 |
|---|---|---|
| committer | Graham Linden <graham@lindenlab.com> | 2018-10-10 18:44:03 +0100 |
| commit | 79d33f9d19a0c6e5ed34ffbd01a31cb2625e1ecc (patch) | |
| tree | f0bbe587871419ecd36363c5c1d0def6e9166825 /indra/newview/llsettingsvo.cpp | |
| parent | 4b174a31c8db1bf7f378f9b088c1335651a34ec5 (diff) | |
Fix names of WATER_BLUR_MULTIPILER.
Give wave direction uniforms more meaningful names in shaders.
Add comments on glow size/focus conversions for clarity.
Diffstat (limited to 'indra/newview/llsettingsvo.cpp')
| -rw-r--r-- | indra/newview/llsettingsvo.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llsettingsvo.cpp b/indra/newview/llsettingsvo.cpp index 17384a3a6b..8e55ae395a 100644 --- a/indra/newview/llsettingsvo.cpp +++ b/indra/newview/llsettingsvo.cpp @@ -791,7 +791,7 @@ LLSD LLSettingsVOWater::convertToLegacy(const LLSettingsWater::ptr_t &pwater) LLSD legacy(LLSD::emptyMap()); LLSD settings = pwater->getSettings(); - legacy[SETTING_LEGACY_BLUR_MULTIPILER] = settings[SETTING_BLUR_MULTIPILER]; + legacy[SETTING_LEGACY_BLUR_MULTIPLIER] = settings[SETTING_BLUR_MULTIPLIER]; legacy[SETTING_LEGACY_FOG_COLOR] = ensure_array_4(settings[SETTING_FOG_COLOR], 1.0f); legacy[SETTING_LEGACY_FOG_DENSITY] = settings[SETTING_FOG_DENSITY]; legacy[SETTING_LEGACY_FOG_MOD] = settings[SETTING_FOG_MOD]; |