From 5bc31e5992ad3891de469b4c452090f7f348fcbb Mon Sep 17 00:00:00 2001 From: Graham Linden Date: Fri, 15 Feb 2019 16:21:42 -0800 Subject: SL-10561, SL-9729 Replace dropped scaling factor for density_multiplier of 1000 from original WL param manager. --- indra/newview/llpaneleditsky.cpp | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'indra') diff --git a/indra/newview/llpaneleditsky.cpp b/indra/newview/llpaneleditsky.cpp index bbd1beb246..fdd365cc92 100644 --- a/indra/newview/llpaneleditsky.cpp +++ b/indra/newview/llpaneleditsky.cpp @@ -103,6 +103,7 @@ namespace const F32 SLIDER_SCALE_BLUE_HORIZON_DENSITY(2.0f); const F32 SLIDER_SCALE_GLOW_R(20.0f); const F32 SLIDER_SCALE_GLOW_B(-5.0f); + const F32 SLIDER_SCALE_DENSITY_MULTIPLIER(0.001f); } static LLPanelInjector t_settings_atmos("panel_settings_atmos"); @@ -184,7 +185,9 @@ void LLPanelSettingsSkyAtmosTab::refresh() getChild(FIELD_SKY_HAZE_HORIZON)->setValue(mSkySettings->getHazeHorizon()); getChild(FIELD_SKY_HAZE_DENSITY)->setValue(mSkySettings->getHazeDensity()); getChild(FIELD_SKY_SCENE_GAMMA)->setValue(mSkySettings->getGamma()); - getChild(FIELD_SKY_DENSITY_MULTIP)->setValue(mSkySettings->getDensityMultiplier()); + F32 density_mult = mSkySettings->getDensityMultiplier(); + density_mult /= SLIDER_SCALE_DENSITY_MULTIPLIER; + getChild(FIELD_SKY_DENSITY_MULTIP)->setValue(density_mult); getChild(FIELD_SKY_DISTANCE_MULTIP)->setValue(mSkySettings->getDistanceMultiplier()); getChild(FIELD_SKY_MAX_ALT)->setValue(mSkySettings->getMaxY()); @@ -242,7 +245,9 @@ void LLPanelSettingsSkyAtmosTab::onSceneGammaChanged() void LLPanelSettingsSkyAtmosTab::onDensityMultipChanged() { - mSkySettings->setDensityMultiplier(getChild(FIELD_SKY_DENSITY_MULTIP)->getValue().asReal()); + F32 density_mult = getChild(FIELD_SKY_DENSITY_MULTIP)->getValue().asReal(); + density_mult *= SLIDER_SCALE_DENSITY_MULTIPLIER; + mSkySettings->setDensityMultiplier(density_mult); mSkySettings->update(); setIsDirty(); } -- cgit v1.2.3