From 552d1d421b4c67dfdf3fe14316116b34b54e97d7 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Tue, 20 Aug 2024 23:23:55 +0300
Subject: viewer#2363 Region Day Offset error with Time of Day
When we have a 23h day cycle and 23h offset, doing a 24h flip will
result in -1h. Flip by day length instead so that 23h-23h will result
in 0h.
This has a negative side effect of values not being saved exactly as
users specified them, so a -1h offset will turn to 4h on next load
with a 5h long day. But it is nature of a day to 'loop', so I decided
there is no point to translate -1 into 14 or something like that.
---
indra/newview/llpanelenvironment.cpp | 12 +++++++++---
1 file changed, 9 insertions(+), 3 deletions(-)
(limited to 'indra')
diff --git a/indra/newview/llpanelenvironment.cpp b/indra/newview/llpanelenvironment.cpp
index 51e2c05070..2a4323d3e6 100644
--- a/indra/newview/llpanelenvironment.cpp
+++ b/indra/newview/llpanelenvironment.cpp
@@ -296,7 +296,7 @@ void LLPanelEnvironmentInfo::refresh()
F32Hours dayoffset(mCurrentEnvironment->mDayOffset);
if (dayoffset.value() > 12.0f)
- dayoffset -= F32Hours(24.0);
+ dayoffset -= daylength;
mSliderDayLength->setValue(daylength.value());
mSliderDayOffset->setValue(dayoffset.value());
@@ -723,6 +723,11 @@ void LLPanelEnvironmentInfo::onSldDayLengthChanged(F32 value)
F32Hours daylength(value);
mCurrentEnvironment->mDayLength = daylength;
+ F32 offset = (F32)mSliderDayOffset->getValue().asReal();
+ if (offset <= 0.0f)
+ {
+ onSldDayOffsetChanged(offset);
+ }
setDirtyFlag(DIRTY_FLAG_DAYLENGTH);
udpateApparentTimeOfDay();
@@ -736,7 +741,8 @@ void LLPanelEnvironmentInfo::onSldDayOffsetChanged(F32 value)
F32Hours dayoffset(value);
if (dayoffset.value() <= 0.0f)
- dayoffset += F32Hours(24.0);
+ // if day cycle is 5 hours long, we want -1h offset to result in 4h
+ dayoffset += mCurrentEnvironment->mDayLength;
mCurrentEnvironment->mDayOffset = dayoffset;
setDirtyFlag(DIRTY_FLAG_DAYOFFSET);
@@ -929,7 +935,7 @@ void LLPanelEnvironmentInfo::udpateApparentTimeOfDay()
{
static const F32 SECONDSINDAY(24.0 * 60.0 * 60.0);
- if ((!mCurrentEnvironment) || (mCurrentEnvironment->mDayLength.value() < 1.0) || (mCurrentEnvironment->mDayOffset.value() < 1.0))
+ if ((!mCurrentEnvironment) || (mCurrentEnvironment->mDayLength.value() < 1.0))
{
mLabelApparentTime->setVisible(false);
return;
--
cgit v1.2.3