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

Fixed unit tests for Load OAR

Browse Source
This commit is contained in:
Oren Hurvitz
2021-03-18 12:41:43 +02:00
parent 73619763b9
commit 4445bc1222
2 changed files with 18 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs
View File

@@ -1104,7 +1104,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver
currentRegionSettings.CacheID = UUID.Random(); currentRegionSettings.CacheID = UUID.Random();
currentRegionSettings.Save(); currentRegionSettings.Save();
scene.EstateDataService.StoreEstateSettings(scene.RegionInfo.EstateSettings); scene.EstateDataServiceSafe?.StoreEstateSettings(scene.RegionInfo.EstateSettings);
IEstateModule estateModule = scene.RequestModuleInterface<IEstateModule>(); IEstateModule estateModule = scene.RequestModuleInterface<IEstateModule>();
if (estateModule != null) if (estateModule != null)

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

@@ -556,7 +556,7 @@ namespace OpenSim.Region.Framework.Scenes
{ {
if (m_EstateDataService == null) if (m_EstateDataService == null)
{ {
m_EstateDataService = RequestModuleInterface<IEstateDataService>(); m_EstateDataService = EstateDataServiceSafe;
if (m_EstateDataService == null) if (m_EstateDataService == null)
{ {
@@ -568,6 +568,22 @@ namespace OpenSim.Region.Framework.Scenes
} }
} }
/// <summary>
/// Similar to 'EstateDataService', but if the service isn't found returns null instead of throwing an exception.
/// </summary>
public IEstateDataService EstateDataServiceSafe
{
get
{
if (m_EstateDataService == null)
{
m_EstateDataService = RequestModuleInterface<IEstateDataService>();
}
return m_EstateDataService;
}
}
public IAssetService AssetService public IAssetService AssetService
{ {
get get