2 files changed, 15 insertions, 7 deletions
diff --git a/indra/llinventory/llsettingssky.cpp b/indra/llinventory/llsettingssky.cpp
index 3685915ffd..ce6244d038 100644
--- a/indra/llinventory/llsettingssky.cpp
+++ b/indra/llinventory/llsettingssky.cpp
@@ -1995,6 +1995,7 @@ F32 LLSettingsSky::getCloudShadow() const
 void LLSettingsSky::setCloudShadow(F32 val)
 {
     mCloudShadow = val;
+    setDirtyFlag(true);
     setLLSDDirty();
 }
 
@@ -2051,6 +2052,7 @@ F32 LLSettingsSky::getMaxY() const
 void LLSettingsSky::setMaxY(F32 val)
 {
     mMaxY = val;
+    setDirtyFlag(true);
     setLLSDDirty();
 }
 
@@ -2062,6 +2064,7 @@ LLQuaternion LLSettingsSky::getMoonRotation() const
 void LLSettingsSky::setMoonRotation(const LLQuaternion &val)
 {
     mMoonRotation = val;
+    setDirtyFlag(true);
     setLLSDDirty();
 }
 
@@ -2073,6 +2076,7 @@ F32 LLSettingsSky::getMoonScale() const
 void LLSettingsSky::setMoonScale(F32 val)
 {
     mMoonScale = val;
+    setDirtyFlag(true);
     setLLSDDirty();
 }
 
@@ -2095,6 +2099,7 @@ F32 LLSettingsSky::getMoonBrightness() const
 void LLSettingsSky::setMoonBrightness(F32 brightness_factor)
 {
     mMoonBrightness = brightness_factor;
+    setDirtyFlag(true);
     setLLSDDirty();
 }
 
@@ -2131,6 +2136,7 @@ LLColor3 LLSettingsSky::getSunlightColorClamped() const
 void LLSettingsSky::setSunlightColor(const LLColor3 &val)
 {
     mSunlightColor = val;
+    setDirtyFlag(true);
     setLLSDDirty();
 }
 
@@ -2142,6 +2148,7 @@ LLQuaternion LLSettingsSky::getSunRotation() const
 void LLSettingsSky::setSunRotation(const LLQuaternion &val)
 {
     mSunRotation = val;
+    setDirtyFlag(true);
     setLLSDDirty();
 }
 
@@ -2153,6 +2160,7 @@ F32 LLSettingsSky::getSunScale() const
 void LLSettingsSky::setSunScale(F32 val)
 {
     mSunScale = val;
+    setDirtyFlag(true);
     setLLSDDirty();
 }
 
diff --git a/indra/llinventory/llsettingswater.cpp b/indra/llinventory/llsettingswater.cpp
index 08e18ea26e..b30dbfeac2 100644
--- a/indra/llinventory/llsettingswater.cpp
+++ b/indra/llinventory/llsettingswater.cpp
@@ -239,15 +239,15 @@ void LLSettingsWater::blend(LLSettingsBase::ptr_t &end, F64 blendf)
     {
         mSettingFlags |= other->mSettingFlags;
 
-        mBlurMultiplier = lerp((F32)blendf, mBlurMultiplier, other->mBlurMultiplier);
+        mBlurMultiplier = lerp(mBlurMultiplier, other->mBlurMultiplier, (F32)blendf);
         lerpColor(mWaterFogColor, other->mWaterFogColor, (F32)blendf);
-        mWaterFogDensity = lerp((F32)blendf, mWaterFogDensity, other->mWaterFogDensity);
-        mFogMod = lerp((F32)blendf, mFogMod, other->mFogMod);
-        mFresnelOffset = lerp((F32)blendf, mFresnelOffset, other->mFresnelOffset);
-        mFresnelScale = lerp((F32)blendf, mFresnelScale, other->mFresnelScale);
+        mWaterFogDensity = lerp(mWaterFogDensity, other->mWaterFogDensity, (F32)blendf);
+        mFogMod = lerp(mFogMod, other->mFogMod, (F32)blendf);
+        mFresnelOffset = lerp(mFresnelOffset, other->mFresnelOffset, (F32)blendf);
+        mFresnelScale = lerp(mFresnelScale, other->mFresnelScale, (F32)blendf);
         lerpVector3(mNormalScale, other->mNormalScale, (F32)blendf);
-        mScaleAbove = lerp((F32)blendf, mScaleAbove, other->mScaleAbove);
-        mScaleBelow = lerp((F32)blendf, mScaleBelow, other->mScaleBelow);
+        mScaleAbove = lerp(mScaleAbove, other->mScaleAbove, (F32)blendf);
+        mScaleBelow = lerp(mScaleBelow, other->mScaleBelow, (F32)blendf);
         lerpVector2(mWave1Dir, other->mWave1Dir, (F32)blendf);
         lerpVector2(mWave2Dir, other->mWave2Dir, (F32)blendf);