From 9bacdc988637615af3e4971eb6dbe3b167720a71 Mon Sep 17 00:00:00 2001 From: Graham Linden Date: Wed, 4 Jul 2018 01:33:22 +0100 Subject: Fix up sun glow/size bindings in edit panel. --- indra/newview/llpaneleditsky.cpp | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/indra/newview/llpaneleditsky.cpp b/indra/newview/llpaneleditsky.cpp index 3f1ca69178..3c976c299e 100644 --- a/indra/newview/llpaneleditsky.cpp +++ b/indra/newview/llpaneleditsky.cpp @@ -330,13 +330,9 @@ void LLPanelSettingsSkySunMoonTab::refresh() getChild(FIELD_SKY_SUN_MOON_COLOR)->set(mSkySettings->getSunlightColor() / SLIDER_SCALE_SUN_AMBIENT); LLColor3 glow(mSkySettings->getGlow()); - - glow.mV[0] = 2 - (glow.mV[0] / SLIDER_SCALE_GLOW_R); - glow.mV[2] /= SLIDER_SCALE_GLOW_B; - - getChild(FIELD_SKY_GLOW_FOCUS)->setValue(glow.mV[0]); - getChild(FIELD_SKY_GLOW_SIZE)->setValue(glow.mV[2]); - + + getChild(FIELD_SKY_GLOW_SIZE)->setValue(2.0 - (glow.mV[0] / SLIDER_SCALE_GLOW_R)); + getChild(FIELD_SKY_GLOW_FOCUS)->setValue(glow.mV[2] / SLIDER_SCALE_GLOW_B); getChild(FIELD_SKY_STAR_BRIGHTNESS)->setValue(mSkySettings->getStarBrightness()); getChild(FIELD_SKY_SUN_ROTATION)->setRotation(mSkySettings->getSunRotation()); getChild(FIELD_SKY_SUN_IMAGE)->setValue(mSkySettings->getSunTextureId()); @@ -356,10 +352,9 @@ void LLPanelSettingsSkySunMoonTab::onSunMoonColorChanged() void LLPanelSettingsSkySunMoonTab::onGlowChanged() { - LLColor3 glow(getChild(FIELD_SKY_GLOW_FOCUS)->getValue().asReal(), 0.0f, - getChild(FIELD_SKY_GLOW_SIZE)->getValue().asReal()); + LLColor3 glow(getChild(FIELD_SKY_GLOW_SIZE)->getValue().asReal(), 0.0f, getChild(FIELD_SKY_GLOW_FOCUS)->getValue().asReal()); - glow.mV[0] = (2 - glow.mV[0]) * SLIDER_SCALE_GLOW_R; + glow.mV[0] = (2.0f - glow.mV[0]) * SLIDER_SCALE_GLOW_R; glow.mV[2] *= SLIDER_SCALE_GLOW_B; mSkySettings->setGlow(glow); -- cgit v1.2.3