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

clear parcels uglysky on clearing override flag

Browse Source
This commit is contained in:
UbitUmarov
2020-06-17 21:08:52 +01:00
parent e7807d4359
commit 369a2e1453
8 changed files with 38 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
OpenSim/Region/Framework/Interfaces/IEnvironmentModule.cs
View File

@@ -36,6 +36,7 @@ namespace OpenSim.Region.Framework.Interfaces
void FromLightShare(RegionLightShareData wl);
RegionLightShareData ToLightShare();
byte[] GetDefaultAssetData(int type);
void WindlightRefresh(int interpolate, bool notforparcel = true);
float GetRegionDayFractionTime();
int GetRegionDayLength();

14
OpenSim/Region/Framework/Scenes/Scene.cs
View File

@@ -5884,16 +5884,22 @@ Environment.Exit(1);
IEstateDataService estateDataService = EstateDataService;
if (estateDataService != null)
{
bool parcelEnvOvr = RegionInfo.EstateSettings.AllowEnviromentOverride;
RegionInfo.EstateSettings = estateDataService.LoadEstateSettings(RegionInfo.RegionID, false);
TriggerEstateSunUpdate();
if(parcelEnvOvr && !RegionInfo.EstateSettings.AllowEnviromentOverride)
ClearAllParcelEnviroments();
}
}
public void TriggerEstateSunUpdate()
public void ClearAllParcelEnviroments()
{
EventManager.TriggerEstateToolsSunUpdate(RegionInfo.RegionHandle);
IEnvironmentModule envM = RequestModuleInterface<IEnvironmentModule>();
if(LandChannel != null && envM != null)
{
LandChannel.ClearAllEnviroments();
envM.WindlightRefresh(1,false);
}
}
private void HandleReloadEstate(string module, string[] cmd)
{
if (MainConsole.Instance.ConsoleScene == null ||