ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-05 17:05:55 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix silly bugs on osReplaceRegionEnvironment()

Browse Source
This commit is contained in:
UbitUmarov
2020-09-12 20:10:45 +01:00
parent 64fea8f20c
commit 4273519197
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
View File

@@ -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;