lotek/opensim
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' into lickx

Browse Source
This commit is contained in:
lickx
2025-04-14 10:03:11 +02:00
parent f521cc201a 98703ff3a2
commit 03ab7627bc
1 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
OpenSim/Region/CoreModules/World/Archiver/ArchiveWriteRequest.cs
View File

@@ -271,11 +271,11 @@ namespace OpenSim.Region.CoreModules.World.Archiver
}
}
UuidGatherer assetGatherer = new UuidGatherer(scene.AssetService, assetUuids, failedIDs, uncertainAssetsUUIDs);
int prevAssets = assetUuids.Count;
if (SaveAssets)
{
UuidGatherer assetGatherer = new UuidGatherer(scene.AssetService, assetUuids, failedIDs, uncertainAssetsUUIDs);
int prevAssets = assetUuids.Count;
foreach (SceneObjectGroup sceneObject in sceneObjects)
{
int curErrorCntr = assetGatherer.ErrorCount;
@@ -333,16 +333,18 @@ namespace OpenSim.Region.CoreModules.World.Archiver
assetUuids[regionSettings.TerrainTexture4] = (sbyte)AssetType.Texture;
if (regionSettings.TerrainPBR1 != RegionSettings.DEFAULT_TERRAIN_PBR_1)
assetUuids[regionSettings.TerrainPBR1] = (sbyte)AssetType.Texture; // it can be both tex or material
assetGatherer.AddForInspection(regionSettings.TerrainPBR1);
if (regionSettings.TerrainPBR2 != RegionSettings.DEFAULT_TERRAIN_PBR_2)
assetUuids[regionSettings.TerrainPBR2] = (sbyte)AssetType.Texture;
assetGatherer.AddForInspection(regionSettings.TerrainPBR2);
if (regionSettings.TerrainPBR3 != RegionSettings.DEFAULT_TERRAIN_PBR_3)
assetUuids[regionSettings.TerrainPBR3] = (sbyte)AssetType.Texture;
assetGatherer.AddForInspection(regionSettings.TerrainPBR3);
if (regionSettings.TerrainPBR4 != RegionSettings.DEFAULT_TERRAIN_PBR_4)
assetUuids[regionSettings.TerrainPBR4] = (sbyte)AssetType.Texture;
assetGatherer.AddForInspection(regionSettings.TerrainPBR4);
assetGatherer.GatherAll();
if (scene.RegionEnvironment != null)
scene.RegionEnvironment.GatherAssets(assetUuids);