From 42735191977175af807de9734ae1f1665b635a85 Mon Sep 17 00:00:00 2001 From: UbitUmarov Date: Sat, 12 Sep 2020 20:10:45 +0100 Subject: [PATCH] fix silly bugs on osReplaceRegionEnvironment() --- .../ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs index c06f13967d..863f4068ad 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs @@ -5892,7 +5892,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api VEnv = parcel.LandData.Environment; bool changed = false; - if (!string.IsNullOrEmpty(daycycle) || !(daycycle == ScriptBaseClass.NULL_KEY)) + if (!string.IsNullOrEmpty(daycycle) && (daycycle != ScriptBaseClass.NULL_KEY)) { UUID envID = ScriptUtils.GetAssetIdFromKeyOrItemName(m_host, daycycle); @@ -5937,7 +5937,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api ViewerEnvironment VEnv = m_envModule.GetRegionEnvironment().Clone(); bool changed = false; - if (!string.IsNullOrEmpty(daycycle) || !(daycycle == ScriptBaseClass.NULL_KEY)) + if (!string.IsNullOrEmpty(daycycle) && (daycycle != ScriptBaseClass.NULL_KEY)) { UUID envID = ScriptUtils.GetAssetIdFromKeyOrItemName(m_host, daycycle); @@ -5965,7 +5965,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api { int ll = VEnv.DayLength; VEnv.DayLength = (int)(daylen * 3600f); - changed = ll != VEnv.DayLength; + changed |= ll != VEnv.DayLength; } if (dayoffset >= -11.5 && dayoffset <= 11.5) @@ -5973,8 +5973,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api int lo = VEnv.DayLength; if (dayoffset <= 0) dayoffset+= 24; - VEnv.DayLength = (int)(dayoffset * 3600f); - changed = lo != VEnv.DayOffset; + VEnv.DayOffset = (int)(dayoffset * 3600f); + changed |= lo != VEnv.DayOffset; } bool needSort = false;