diff options
| author | Graham Linden <graham@lindenlab.com> | 2019-05-13 09:50:09 -0700 |
|---|---|---|
| committer | Graham Linden <graham@lindenlab.com> | 2019-05-13 09:50:09 -0700 |
| commit | 5da1f812dc3262b057be66de945454a7c46f1f44 (patch) | |
| tree | e0ca3c33a5fe291a6d92aa6e8c7e77610ceaa76a /indra | |
| parent | 27c96405a489327302ebeb7d192788447932d7f1 (diff) | |
| parent | f9b6293e85062eaec12e20e55df1f8d705829d85 (diff) | |
Merge
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/newview/llsettingsvo.cpp | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/indra/newview/llsettingsvo.cpp b/indra/newview/llsettingsvo.cpp index d307e1a947..7e0ec23a06 100644 --- a/indra/newview/llsettingsvo.cpp +++ b/indra/newview/llsettingsvo.cpp @@ -566,14 +566,8 @@ void LLSettingsVOSky::convertAtmosphericsToLegacy(LLSD& legacy, LLSD& settings) legacy[SETTING_BLUE_DENSITY] = ensure_array_4(legacyhaze[SETTING_BLUE_DENSITY], 1.0); legacy[SETTING_BLUE_HORIZON] = ensure_array_4(legacyhaze[SETTING_BLUE_HORIZON], 1.0); - F32 density_multiplier = legacyhaze[SETTING_DENSITY_MULTIPLIER].asReal(); - density_multiplier = (density_multiplier < 0.0001f) ? 0.0001f : density_multiplier; - density_multiplier *= 0.9f / 2.0f; // take 0 - 2.0 range to 0 - 0.9 range - legacy[SETTING_DENSITY_MULTIPLIER] = LLSDArray(density_multiplier)(0.0f)(0.0f)(1.0f); - - F32 distance_multiplier = legacyhaze[SETTING_DISTANCE_MULTIPLIER].asReal(); - distance_multiplier *= 0.1f; // take 0 - 1000 range to 0 - 100 range - legacy[SETTING_DISTANCE_MULTIPLIER] = LLSDArray(distance_multiplier)(0.0f)(0.0f)(1.0f); + legacy[SETTING_DENSITY_MULTIPLIER] = LLSDArray(legacyhaze[SETTING_DENSITY_MULTIPLIER].asReal())(0.0f)(0.0f)(1.0f); + legacy[SETTING_DISTANCE_MULTIPLIER] = LLSDArray(legacyhaze[SETTING_DISTANCE_MULTIPLIER].asReal())(0.0f)(0.0f)(1.0f); legacy[SETTING_HAZE_DENSITY] = LLSDArray(legacyhaze[SETTING_HAZE_DENSITY])(0.0f)(0.0f)(1.0f); legacy[SETTING_HAZE_HORIZON] = LLSDArray(legacyhaze[SETTING_HAZE_HORIZON])(0.0f)(0.0f)(1.0f); |