diff options
| author | Rider Linden <rider@lindenlab.com> | 2018-10-10 20:31:10 +0000 |
|---|---|---|
| committer | Rider Linden <rider@lindenlab.com> | 2018-10-10 20:31:10 +0000 |
| commit | de34937c50492cb9d79859af000554d876ef7267 (patch) | |
| tree | 71afaf9dc2caf91d843a34fd8691055d93cd7f49 /indra/newview/llsettingsvo.cpp | |
| parent | 198b3b6b99f494543c62b4e0923c14931fd4ab00 (diff) | |
| parent | 89a9eb1e54bbc421006ade44ba048b00e0a5a4a3 (diff) | |
Merged in graham_linden/viewer-eep-graham (pull request #143)
SL-1925
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]; |