From d25f80181463d373c317835a219903bcdf9b91c8 Mon Sep 17 00:00:00 2001 From: Rider Linden Date: Mon, 25 Jun 2018 14:44:09 -0700 Subject: Fix cloud scroll adjustment in the editor, pause clouds method, set sun disk UUID to null. --- indra/newview/llpaneleditsky.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'indra/newview/llpaneleditsky.cpp') diff --git a/indra/newview/llpaneleditsky.cpp b/indra/newview/llpaneleditsky.cpp index b6cd4bb37f..3f1ca69178 100644 --- a/indra/newview/llpaneleditsky.cpp +++ b/indra/newview/llpaneleditsky.cpp @@ -71,6 +71,8 @@ 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 LLVector2 CLOUD_SCROLL_ADJUST(10, 10); } static LLPanelInjector t_settings_atmos("panel_settings_atmos"); @@ -226,6 +228,7 @@ void LLPanelSettingsSkyCloudTab::refresh() getChild(FIELD_SKY_CLOUD_SCALE)->setValue(mSkySettings->getCloudScale()); LLVector2 cloudScroll(mSkySettings->getCloudScrollRate()); + cloudScroll -= CLOUD_SCROLL_ADJUST; getChild(FIELD_SKY_CLOUD_SCROLL_XY)->setValue(cloudScroll.getValue()); getChild(FIELD_SKY_CLOUD_MAP)->setValue(mSkySettings->getCloudNoiseTextureId()); @@ -260,7 +263,7 @@ void LLPanelSettingsSkyCloudTab::onCloudScaleChanged() void LLPanelSettingsSkyCloudTab::onCloudScrollChanged() { LLVector2 scroll(getChild(FIELD_SKY_CLOUD_SCROLL_XY)->getValue()); - + scroll += CLOUD_SCROLL_ADJUST; mSkySettings->setCloudScrollRate(scroll); } -- cgit v1.2.3