SL-10912

Fix conversion of star brightness, density mult, and distance mult to legacy ranges.

Make settings look in both legacyhaze and top-level settings for haze params.

3 files changed, 36 insertions, 38 deletions

diff --git a/indra/llinventory/llsettingssky.cpp b/indra/llinventory/llsettingssky.cpp
index 9211a48a8e..a0d81e6d99 100644
--- a/indra/llinventory/llsettingssky.cpp
+++ b/indra/llinventory/llsettingssky.cpp
@@ -737,7 +737,7 @@ LLSD LLSettingsSky::defaults(const LLSettingsBase::TrackPosition& position)
         dfltsetting[SETTING_MOON_ROTATION]      = moonquat.getValue();
         dfltsetting[SETTING_MOON_BRIGHTNESS]    = LLSD::Real(0.5f);
 
-        dfltsetting[SETTING_STAR_BRIGHTNESS]    = LLSD::Real(256.0000);
+        dfltsetting[SETTING_STAR_BRIGHTNESS]    = LLSD::Real(250.0000);
         dfltsetting[SETTING_SUNLIGHT_COLOR]     = LLColor4(0.7342, 0.7815, 0.8999, 0.0).getValue();
         dfltsetting[SETTING_SUN_ROTATION]       = sunquat.getValue();
 
@@ -1037,72 +1037,65 @@ LLColor3 LLSettingsSky::getLightDiffuse() const
     return LLColor3::white;
 }
 
-LLColor3 LLSettingsSky::getAmbientColor() const
+LLColor3 LLSettingsSky::getColor(const std::string& key, const LLColor3& default_value) const
 {
-    if (mSettings.has(SETTING_LEGACY_HAZE) && mSettings[SETTING_LEGACY_HAZE].has(SETTING_AMBIENT))
+    if (mSettings.has(SETTING_LEGACY_HAZE) && mSettings[SETTING_LEGACY_HAZE].has(key))
     {
-        return LLColor3(mSettings[SETTING_LEGACY_HAZE][SETTING_AMBIENT]);
+        return LLColor3(mSettings[SETTING_LEGACY_HAZE][key]);
     }
-    if (mSettings.has(SETTING_AMBIENT))
+    if (mSettings.has(key))
     {
-        return LLColor3(mSettings[SETTING_AMBIENT]);
+        return LLColor3(mSettings[key]);
     }
-    return LLColor3(0.25f, 0.25f, 0.25f);
+    return default_value;
 }
 
-LLColor3 LLSettingsSky::getBlueDensity() const
+F32 LLSettingsSky::getFloat(const std::string& key, F32 default_value) const
 {
-    if (mSettings.has(SETTING_LEGACY_HAZE) && mSettings[SETTING_LEGACY_HAZE].has(SETTING_BLUE_DENSITY))
+    if (mSettings.has(SETTING_LEGACY_HAZE) && mSettings[SETTING_LEGACY_HAZE].has(key))
+    {
+        return mSettings[SETTING_LEGACY_HAZE][key].asReal();
+    }
+    if (mSettings.has(key))
     {
-        return LLColor3(mSettings[SETTING_LEGACY_HAZE][SETTING_BLUE_DENSITY]);
+        return mSettings[key].asReal();
     }
-    return LLColor3(0.2447f, 0.4487f, 0.7599f);
+    return default_value;
+}
+
+LLColor3 LLSettingsSky::getAmbientColor() const
+{
+    return getColor(SETTING_AMBIENT, LLColor3(0.25f, 0.25f, 0.25f));
+}
+
+LLColor3 LLSettingsSky::getBlueDensity() const
+{
+    return getColor(SETTING_BLUE_DENSITY, LLColor3(0.2447f, 0.4487f, 0.7599f));
 }
 
 LLColor3 LLSettingsSky::getBlueHorizon() const
 {
-    if (mSettings.has(SETTING_LEGACY_HAZE) && mSettings[SETTING_LEGACY_HAZE].has(SETTING_BLUE_HORIZON))
-    {
-        return LLColor3(mSettings[SETTING_LEGACY_HAZE][SETTING_BLUE_HORIZON]);
-    }
-    return LLColor3(0.4954f, 0.4954f, 0.6399f);
+    return getColor(SETTING_BLUE_HORIZON, LLColor3(0.4954f, 0.4954f, 0.6399f));
 }
 
 F32 LLSettingsSky::getHazeDensity() const
 {
-    if (mSettings.has(SETTING_LEGACY_HAZE) && mSettings[SETTING_LEGACY_HAZE].has(SETTING_HAZE_DENSITY))
-    {
-        return mSettings[SETTING_LEGACY_HAZE][SETTING_HAZE_DENSITY].asReal();
-    }
-    return 0.7f;
+    return getFloat(SETTING_HAZE_DENSITY, 0.7f);
 }
 
 F32 LLSettingsSky::getHazeHorizon() const
 {
-    if (mSettings.has(SETTING_LEGACY_HAZE) && mSettings[SETTING_LEGACY_HAZE].has(SETTING_HAZE_HORIZON))
-    {
-        return mSettings[SETTING_LEGACY_HAZE][SETTING_HAZE_HORIZON].asReal();
-    }
-    return 0.19f;
+    return getFloat(SETTING_HAZE_HORIZON, 0.19f);
 }
 
 F32 LLSettingsSky::getDensityMultiplier() const
 {
-    F32 density_multiplier = 0.0001f;
-    if (mSettings.has(SETTING_LEGACY_HAZE) && mSettings[SETTING_LEGACY_HAZE].has(SETTING_DENSITY_MULTIPLIER))
-    {
-        density_multiplier = mSettings[SETTING_LEGACY_HAZE][SETTING_DENSITY_MULTIPLIER].asReal();
-    }
-    return density_multiplier;
+    return getFloat(SETTING_DENSITY_MULTIPLIER, 0.0001f);
 }
 
 F32 LLSettingsSky::getDistanceMultiplier() const
 {
-    if (mSettings.has(SETTING_LEGACY_HAZE) && mSettings[SETTING_LEGACY_HAZE].has(SETTING_DISTANCE_MULTIPLIER))
-    {
-        return mSettings[SETTING_LEGACY_HAZE][SETTING_DISTANCE_MULTIPLIER].asReal();
-    }
-    return 0.8f;
+    return getFloat(SETTING_DISTANCE_MULTIPLIER, 0.8f);
 }
 
 void LLSettingsSky::setPlanetRadius(F32 radius)
diff --git a/indra/llinventory/llsettingssky.h b/indra/llinventory/llsettingssky.h
index cd173a6b18..d585eeddfa 100644
--- a/indra/llinventory/llsettingssky.h
+++ b/indra/llinventory/llsettingssky.h
@@ -337,6 +337,9 @@ private:
     static LLSD absorptionConfigDefault();
     static LLSD mieConfigDefault();
 
+    LLColor3 getColor(const std::string& key, const LLColor3& default_value) const;
+    F32      getFloat(const std::string& key, F32 default_value) const;
+
     void        calculateHeavenlyBodyPositions() const;
     void        calculateLightSettings() const;
 
diff --git a/indra/newview/llsettingsvo.cpp b/indra/newview/llsettingsvo.cpp
index 6556380f28..60f4cd3f5a 100644
--- a/indra/newview/llsettingsvo.cpp
+++ b/indra/newview/llsettingsvo.cpp
@@ -568,9 +568,11 @@ void LLSettingsVOSky::convertAtmosphericsToLegacy(LLSD& legacy, LLSD& settings)
 
         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_HAZE_DENSITY]        = LLSDArray(legacyhaze[SETTING_HAZE_DENSITY])(0.0f)(0.0f)(1.0f);
@@ -597,7 +599,7 @@ LLSD LLSettingsVOSky::convertToLegacy(const LLSettingsSky::ptr_t &psky, bool isA
     legacy[SETTING_GLOW] = ensure_array_4(settings[SETTING_GLOW], 1.0);
     legacy[SETTING_LIGHT_NORMAL] = ensure_array_4(psky->getLightDirection().getValue(), 0.0f);
     legacy[SETTING_MAX_Y] = LLSDArray(settings[SETTING_MAX_Y])(0.0f)(0.0f)(1.0f);
-    legacy[SETTING_STAR_BRIGHTNESS] = settings[SETTING_STAR_BRIGHTNESS];
+    legacy[SETTING_STAR_BRIGHTNESS] = settings[SETTING_STAR_BRIGHTNESS].asReal() / 250.0f; // convert from 0-500 -> 0-2 ala pre-FS-compat changes
     legacy[SETTING_SUNLIGHT_COLOR] = ensure_array_4(settings[SETTING_SUNLIGHT_COLOR], 1.0f);
     
     LLVector3 dir = psky->getLightDirection();