Fix cloud scroll adjustment in the editor, pause clouds method, set sun disk UUID to null.

4 files changed, 12 insertions, 3 deletions

diff --git a/indra/llinventory/llsettingssky.cpp b/indra/llinventory/llsettingssky.cpp
index bf0115b80b..250af5a392 100644
--- a/indra/llinventory/llsettingssky.cpp
+++ b/indra/llinventory/llsettingssky.cpp
@@ -622,7 +622,7 @@ LLSD LLSettingsSky::defaults(const LLSettingsBase::TrackPosition& position)
         dfltsetting[SETTING_BLOOM_TEXTUREID]    = IMG_BLOOM1;
         dfltsetting[SETTING_CLOUD_TEXTUREID]    = GetDefaultCloudNoiseTextureId();
         dfltsetting[SETTING_MOON_TEXTUREID]     = GetDefaultMoonTextureId();
-        dfltsetting[SETTING_SUN_TEXTUREID]      = GetDefaultSunTextureId();
+        dfltsetting[SETTING_SUN_TEXTUREID]      = LLUUID::null; // GetDefaultSunTextureId();
 
         dfltsetting[SETTING_TYPE] = "sky";
 
diff --git a/indra/newview/llenvironment.cpp b/indra/newview/llenvironment.cpp
index e3a030225d..94605dc062 100644
--- a/indra/newview/llenvironment.cpp
+++ b/indra/newview/llenvironment.cpp
@@ -258,6 +258,8 @@ const F32 LLEnvironment::SUN_DELTA_YAW(F_PI);   // 180deg
 
 //-------------------------------------------------------------------------
 LLEnvironment::LLEnvironment():
+    mCloudScrollDelta(),
+    mCloudScrollPaused(false),
     mSelectedSky(),
     mSelectedWater(),
     mSelectedDay(),
@@ -851,7 +853,7 @@ void LLEnvironment::updateCloudScroll()
 
     F64 delta_t = s_cloud_timer.getElapsedTimeAndResetF64();
     
-    if (mCurrentEnvironment->getSky())
+    if (mCurrentEnvironment->getSky() && !mCloudScrollPaused)
     {
         LLVector2 cloud_delta = static_cast<F32>(delta_t)* (mCurrentEnvironment->getSky()->getCloudScrollRate() - LLVector2(10.0, 10.0)) / 100.0;
         mCloudScrollDelta += cloud_delta;
diff --git a/indra/newview/llenvironment.h b/indra/newview/llenvironment.h
index 0fdedb91f7..d2664717dd 100644
--- a/indra/newview/llenvironment.h
+++ b/indra/newview/llenvironment.h
@@ -185,6 +185,9 @@ public:
     void                        updateEnvironment(LLSettingsBase::Seconds transition = TRANSITION_DEFAULT, bool forced = false);
 
     inline LLVector2            getCloudScrollDelta() const { return mCloudScrollDelta; }
+    void                        pauseCloudScroll()          { mCloudScrollPaused = true; }
+    void                        resumeCloudScroll()         { mCloudScrollPaused = false; }
+    bool                        isCloudScrollPaused() const { return mCloudScrollPaused; }
 
     F32                         getCamHeight() const;
     F32                         getWaterHeight() const;
@@ -331,6 +334,7 @@ private:
     F32                         mLastCamYaw = 0.0f;
 
     LLVector2                   mCloudScrollDelta;  // cumulative cloud delta
+    bool                        mCloudScrollPaused;
 
     InstanceArray_t             mEnvironments;
 
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<LLPanelSettingsSkyAtmosTab> t_settings_atmos("panel_settings_atmos");
@@ -226,6 +228,7 @@ void LLPanelSettingsSkyCloudTab::refresh()
     getChild<LLUICtrl>(FIELD_SKY_CLOUD_SCALE)->setValue(mSkySettings->getCloudScale());
 
     LLVector2 cloudScroll(mSkySettings->getCloudScrollRate());
+    cloudScroll -= CLOUD_SCROLL_ADJUST;
     getChild<LLUICtrl>(FIELD_SKY_CLOUD_SCROLL_XY)->setValue(cloudScroll.getValue());
 
     getChild<LLTextureCtrl>(FIELD_SKY_CLOUD_MAP)->setValue(mSkySettings->getCloudNoiseTextureId());
@@ -260,7 +263,7 @@ void LLPanelSettingsSkyCloudTab::onCloudScaleChanged()
 void LLPanelSettingsSkyCloudTab::onCloudScrollChanged()
 {
     LLVector2 scroll(getChild<LLUICtrl>(FIELD_SKY_CLOUD_SCROLL_XY)->getValue());
-
+    scroll += CLOUD_SCROLL_ADJUST;
     mSkySettings->setCloudScrollRate(scroll);
 }