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

a few changes to EstateDataRemoteConnector, LoadEstateSettings can not be fatal so work around it

Browse Source
This commit is contained in:
UbitUmarov
2024-09-22 23:37:42 +01:00
parent 00c0816275
commit a9be42a304
5 changed files with 65 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -874,7 +874,12 @@ namespace OpenSim.Region.Framework.Scenes
RegionInfo.RegionSettings = rs;
if (estateDataService is not null)
RegionInfo.EstateSettings = estateDataService.LoadEstateSettings(RegionInfo.RegionID, false);
{
EstateSettings es = estateDataService.LoadEstateSettings(RegionInfo.RegionID, false);
if (es == null)
m_log.Error($"[SCENE]: Region {Name} failed to load estate settings. Using defaults");
RegionInfo.EstateSettings = new EstateSettings();
}
SceneGridInfo = new GridInfo(config, RegionInfo.ServerURI);
@@ -5815,7 +5820,10 @@ Environment.Exit(1);
if (estateDataService is not null)
{
bool parcelEnvOvr = RegionInfo.EstateSettings.AllowEnvironmentOverride;
RegionInfo.EstateSettings = estateDataService.LoadEstateSettings(RegionInfo.RegionID, false);
EstateSettings es = estateDataService.LoadEstateSettings(RegionInfo.RegionID, false);
if (es == null)
m_log.Error($"[SCENE]: Region {RegionInfo.RegionName} failed to reload estate settings. Using defaults");
RegionInfo.EstateSettings = es;
if(parcelEnvOvr && !RegionInfo.EstateSettings.AllowEnvironmentOverride)
ClearAllParcelEnvironments();
}