2 files changed, 8 insertions, 4 deletions
diff --git a/indra/llinventory/llsettingsdaycycle.cpp b/indra/llinventory/llsettingsdaycycle.cpp
index a45ab5a09c..2baf140e6a 100644
--- a/indra/llinventory/llsettingsdaycycle.cpp
+++ b/indra/llinventory/llsettingsdaycycle.cpp
@@ -143,10 +143,6 @@ LLSettingsDay::LLSettingsDay() :
 //=========================================================================
 LLSD& LLSettingsDay::getSettings()
 {
-    if (mDaySettings.size() > 0)
-    {
-        return mDaySettings;
-    }
     mDaySettings = LLSD::emptyMap();
     LLSD& settings = LLSettingsBase::getSettings();
 
diff --git a/indra/llinventory/llsettingssky.cpp b/indra/llinventory/llsettingssky.cpp
index 98825e031f..03beebd9e1 100644
--- a/indra/llinventory/llsettingssky.cpp
+++ b/indra/llinventory/llsettingssky.cpp
@@ -1996,6 +1996,7 @@ F32 LLSettingsSky::getCloudShadow() const
 void LLSettingsSky::setCloudShadow(F32 val)
 {
     mCloudShadow = val;
+    setDirtyFlag(true);
     setLLSDDirty();
 }
 
@@ -2052,6 +2053,7 @@ F32 LLSettingsSky::getMaxY() const
 void LLSettingsSky::setMaxY(F32 val)
 {
     mMaxY = val;
+    setDirtyFlag(true);
     setLLSDDirty();
 }
 
@@ -2063,6 +2065,7 @@ LLQuaternion LLSettingsSky::getMoonRotation() const
 void LLSettingsSky::setMoonRotation(const LLQuaternion &val)
 {
     mMoonRotation = val;
+    setDirtyFlag(true);
     setLLSDDirty();
 }
 
@@ -2074,6 +2077,7 @@ F32 LLSettingsSky::getMoonScale() const
 void LLSettingsSky::setMoonScale(F32 val)
 {
     mMoonScale = val;
+    setDirtyFlag(true);
     setLLSDDirty();
 }
 
@@ -2096,6 +2100,7 @@ F32 LLSettingsSky::getMoonBrightness() const
 void LLSettingsSky::setMoonBrightness(F32 brightness_factor)
 {
     mMoonBrightness = brightness_factor;
+    setDirtyFlag(true);
     setLLSDDirty();
 }
 
@@ -2132,6 +2137,7 @@ LLColor3 LLSettingsSky::getSunlightColorClamped() const
 void LLSettingsSky::setSunlightColor(const LLColor3 &val)
 {
     mSunlightColor = val;
+    setDirtyFlag(true);
     setLLSDDirty();
 }
 
@@ -2143,6 +2149,7 @@ LLQuaternion LLSettingsSky::getSunRotation() const
 void LLSettingsSky::setSunRotation(const LLQuaternion &val)
 {
     mSunRotation = val;
+    setDirtyFlag(true);
     setLLSDDirty();
 }
 
@@ -2154,6 +2161,7 @@ F32 LLSettingsSky::getSunScale() const
 void LLSettingsSky::setSunScale(F32 val)
 {
     mSunScale = val;
+    setDirtyFlag(true);
     setLLSDDirty();
 }