From c89bfa2ee2d1817af76f586a713d14b4f0e15344 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Mon, 30 Sep 2024 16:43:14 +0300
Subject: [PATCH 1/3] Revert "viewer#2363 Region Day Offset error with Time of
 Day"

---
 indra/newview/llenvironment.cpp      |  1 -
 indra/newview/llpanelenvironment.cpp | 16 +++++-----------
 2 files changed, 5 insertions(+), 12 deletions(-)

diff --git a/indra/newview/llenvironment.cpp b/indra/newview/llenvironment.cpp
index 722c565300..05bd704556 100644
--- a/indra/newview/llenvironment.cpp
+++ b/indra/newview/llenvironment.cpp
@@ -2087,7 +2087,6 @@ void LLEnvironment::coroUpdateEnvironment(S32 parcel_id, S32 track_no, UpdateInf
             body[KEY_ENVIRONMENT][KEY_DAYLENGTH] = updates->mDayLength;
         }
 
-        // server only allows positive values
         if (updates->mDayOffset > 0)
         {
             body[KEY_ENVIRONMENT][KEY_DAYOFFSET] = updates->mDayOffset;
diff --git a/indra/newview/llpanelenvironment.cpp b/indra/newview/llpanelenvironment.cpp
index 7dd9f6e86e..be61c44b7c 100644
--- a/indra/newview/llpanelenvironment.cpp
+++ b/indra/newview/llpanelenvironment.cpp
@@ -287,8 +287,8 @@ void LLPanelEnvironmentInfo::refresh()
     F32Hours daylength(mCurrentEnvironment->mDayLength);
     F32Hours dayoffset(mCurrentEnvironment->mDayOffset);
 
-    while (dayoffset.value() >= daylength.value())
-        dayoffset -= daylength;
+    if (dayoffset.value() > 12.0f)
+        dayoffset -= F32Hours(24.0);
 
     mSliderDayLength->setValue(daylength.value());
     mSliderDayOffset->setValue(dayoffset.value());
@@ -717,11 +717,6 @@ 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();
@@ -734,9 +729,8 @@ void LLPanelEnvironmentInfo::onSldDayOffsetChanged(F32 value)
     {
         F32Hours dayoffset(value);
 
-        // server only allows positive values
-        while (dayoffset.value() <= 0.0f)
-            dayoffset += mCurrentEnvironment->mDayLength;
+        if (dayoffset.value() <= 0.0f)
+            dayoffset += F32Hours(24.0);
 
         mCurrentEnvironment->mDayOffset = dayoffset;
         setDirtyFlag(DIRTY_FLAG_DAYOFFSET);
@@ -928,7 +922,7 @@ void LLPanelEnvironmentInfo::udpateApparentTimeOfDay()
 {
     static const F32 SECONDSINDAY(24.0 * 60.0 * 60.0);
 
-    if ((!mCurrentEnvironment) || (mCurrentEnvironment->mDayLength.value() < 1.0))
+    if ((!mCurrentEnvironment) || (mCurrentEnvironment->mDayLength.value() < 1.0) || (mCurrentEnvironment->mDayOffset.value() < 1.0))
     {
         mLabelApparentTime->setVisible(false);
         return;

From c954609958d5fe2edbdc2f80af9bba5dc8025341 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Mon, 30 Sep 2024 21:21:16 +0300
Subject: [PATCH 2/3] viewer#2735 Fix day cycle not saving values

---
 indra/llinventory/llsettingsdaycycle.cpp | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/indra/llinventory/llsettingsdaycycle.cpp b/indra/llinventory/llsettingsdaycycle.cpp
index a45ab5a09c..2baf140e6a 100644
--- a/indra/llinventory/llsettingsdaycycle.cpp
+++ b/indra/llinventory/llsettingsdaycycle.cpp
@@ -143,10 +143,6 @@ LLSettingsDay::LLSettingsDay() :
 //=========================================================================
 LLSD& LLSettingsDay::getSettings()
 {
-    if (mDaySettings.size() > 0)
-    {
-        return mDaySettings;
-    }
     mDaySettings = LLSD::emptyMap();
     LLSD& settings = LLSettingsBase::getSettings();
 

From 690f099519e155220535e07539238139b16da99f Mon Sep 17 00:00:00 2001
From: Andrey Lihatskiy <alihatskiy@productengine.com>
Date: Thu, 26 Sep 2024 21:26:59 +0300
Subject: [PATCH 3/3] #2519 Move "MediaSoundsEarLocation" and
 "VoiceEarLocation" toggles to the Communicate menu (#2707)

---
 .../skins/default/xui/en/menu_viewer.xml      | 37 ++++++++++---------
 1 file changed, 19 insertions(+), 18 deletions(-)

diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml
index 6f0c391cf3..a03024487f 100644
--- a/indra/newview/skins/default/xui/en/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en/menu_viewer.xml
@@ -465,24 +465,6 @@
           <menu_item_check.on_click
            function="World.AlwaysRun" />
         </menu_item_check>
-        <menu_item_check
-          label="Hear Media and Sound from Avatar"
-          name="Hear Media and Sound from Avatar">
-          <menu_item_check.on_check
-           control="MediaSoundsEarLocation" />
-          <menu_item_check.on_click
-           function="Agent.ToggleHearMediaSoundFromAvatar" />
-        </menu_item_check>
-        <menu_item_check
-          label="Hear Voice from Avatar"
-          name="Hear Voice from Avatar">
-          <menu_item_check.on_check
-           control="VoiceEarLocation" />
-          <menu_item_check.on_click
-           function="Agent.ToggleHearVoiceFromAvatar" />
-          <menu_item_call.on_enable
-           control="EnableVoiceChat" />
-        </menu_item_check>
       <menu_item_separator/>
       <menu_item_check
        label="Gestures..."
@@ -579,6 +561,25 @@
              parameter="conversation" />
         </menu_item_check>
         <menu_item_separator/>
+        <menu_item_check
+          label="Hear Media and Sound from Avatar"
+          name="Hear Media and Sound from Avatar">
+            <menu_item_check.on_check
+             control="MediaSoundsEarLocation" />
+            <menu_item_check.on_click
+             function="Agent.ToggleHearMediaSoundFromAvatar" />
+        </menu_item_check>
+        <menu_item_check
+          label="Hear Voice from Avatar"
+          name="Hear Voice from Avatar">
+            <menu_item_check.on_check
+             control="VoiceEarLocation" />
+            <menu_item_check.on_click
+             function="Agent.ToggleHearVoiceFromAvatar" />
+            <menu_item_call.on_enable
+             control="EnableVoiceChat" />
+        </menu_item_check>
+        <menu_item_separator/>
         <menu_item_check
          label="Gestures..."
          name="Gestures"