summaryrefslogtreecommitdiff
path: root/indra/newview/llfloatereditextdaycycle.cpp
diff options
context:
space:
mode:
authorAndrey Kleshchev <andreykproductengine@lindenlab.com>2021-07-02 23:39:18 +0300
committerAndrey Kleshchev <andreykproductengine@lindenlab.com>2021-07-02 23:41:21 +0300
commit7a468f62730029be9a47a2079fa267788d7a339e (patch)
tree16c121c27d560f0cb06d77a641ac976e32236ebc /indra/newview/llfloatereditextdaycycle.cpp
parent66793abc716d86660e2fa4c7731e235881525c69 (diff)
SL-15528 Crash at reblendSettings
looks like blenders weren't inited yet.
Diffstat (limited to 'indra/newview/llfloatereditextdaycycle.cpp')
-rw-r--r--indra/newview/llfloatereditextdaycycle.cpp18
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)