Merge branch 'master' into DRTVWR-527-maint

# Conflicts:
#	autobuild.xml
#	indra/newview/installers/windows/lang_pl.nsi
#	indra/newview/llfloaterpreference.cpp
#	indra/newview/llinventorymodel.cpp

1 files changed, 13 insertions, 5 deletions

diff --git a/indra/newview/llfloatereditextdaycycle.cpp b/indra/newview/llfloatereditextdaycycle.cpp
index 0501c287ad..281d4f68f5 100644
--- a/indra/newview/llfloatereditextdaycycle.cpp
+++ b/indra/newview/llfloatereditextdaycycle.cpp
@@ -1457,14 +1457,22 @@ void LLFloaterEditExtDayCycle::reblendSettings()
 {
     F64 position = mTimeSlider->getCurSliderValue();
 
-    if ((mSkyBlender->getTrack() != mCurrentTrack) && (mCurrentTrack != LLSettingsDay::TRACK_WATER))
+    if (mSkyBlender)
     {
-        mSkyBlender->switchTrack(mCurrentTrack, position);
+        if ((mSkyBlender->getTrack() != mCurrentTrack) && (mCurrentTrack != LLSettingsDay::TRACK_WATER))
+        {
+            mSkyBlender->switchTrack(mCurrentTrack, position);
+        }
+        else
+        {
+            mSkyBlender->setPosition(position);
+        }
     }
-    else
-        mSkyBlender->setPosition(position);
 
-    mWaterBlender->setPosition(position);    
+    if (mWaterBlender)
+    {
+        mWaterBlender->setPosition(position);
+    }
 }
 
 void LLFloaterEditExtDayCycle::doApplyCommit(LLSettingsDay::ptr_t day)