From c2864468d69d6ef94ba6ec2db23729c490ec8f3d Mon Sep 17 00:00:00 2001
From: andreykproductengine <andreykproductengine@lindenlab.com>
Date: Thu, 28 Mar 2019 19:51:08 +0200
Subject: [PATCH] SL-10766 Viewer is crashed after changing "day offset"
settings
---
indra/newview/llpanelenvironment.cpp | 28 +++++++++++++++++-----------
1 file changed, 17 insertions(+), 11 deletions(-)
diff --git a/indra/newview/llpanelenvironment.cpp b/indra/newview/llpanelenvironment.cpp
index b343c913e50..876b965fe9c 100644
--- a/indra/newview/llpanelenvironment.cpp
+++ b/indra/newview/llpanelenvironment.cpp
@@ -686,30 +686,36 @@ void LLPanelEnvironmentInfo::readjustAltLabels()
void LLPanelEnvironmentInfo::onSldDayLengthChanged(F32 value)
{
- F32Hours daylength(value);
+ if (mCurrentEnvironment)
+ {
+ F32Hours daylength(value);
- mCurrentEnvironment->mDayLength = daylength;
- setDirtyFlag(DIRTY_FLAG_DAYLENGTH);
+ mCurrentEnvironment->mDayLength = daylength;
+ setDirtyFlag(DIRTY_FLAG_DAYLENGTH);
- udpateApparentTimeOfDay();
+ udpateApparentTimeOfDay();
+ }
}
void LLPanelEnvironmentInfo::onSldDayOffsetChanged(F32 value)
{
- F32Hours dayoffset(value);
+ if (mCurrentEnvironment)
+ {
+ F32Hours dayoffset(value);
- if (dayoffset.value() <= 0.0f)
- dayoffset += F32Hours(24.0);
+ if (dayoffset.value() <= 0.0f)
+ dayoffset += F32Hours(24.0);
- mCurrentEnvironment->mDayOffset = dayoffset;
- setDirtyFlag(DIRTY_FLAG_DAYOFFSET);
+ mCurrentEnvironment->mDayOffset = dayoffset;
+ setDirtyFlag(DIRTY_FLAG_DAYOFFSET);
- udpateApparentTimeOfDay();
+ udpateApparentTimeOfDay();
+ }
}
void LLPanelEnvironmentInfo::onDayLenOffsetMouseUp()
{
- if (getDirtyFlag() & (DIRTY_FLAG_DAYLENGTH | DIRTY_FLAG_DAYOFFSET))
+ if (mCurrentEnvironment && (getDirtyFlag() & (DIRTY_FLAG_DAYLENGTH | DIRTY_FLAG_DAYOFFSET)))
{
clearDirtyFlag(DIRTY_FLAG_DAYOFFSET);
clearDirtyFlag(DIRTY_FLAG_DAYLENGTH);
--
GitLab