ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-06 09:16:28 +08:00
Code Issues Packages Projects Releases Wiki Activity

missing files

Browse Source
This commit is contained in:
UbitUmarov
2025-02-11 00:57:04 +00:00
parent b13c4c2055
commit a6bb6b08f6
2 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
OpenSim/Region/CoreModules/World/Archiver/ArchiverModule.cs
View File

@@ -103,6 +103,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver
bool mergeOar = false;
bool mergeReplaceObjects = false;
bool skipAssets = false;
bool forceAssets = false;
bool mergeTerrain = false;
bool mergeParcels = false;
bool noObjects = false;
@@ -118,6 +119,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver
options.Add("m|merge", delegate(string v) { mergeOar = (v != null); });
options.Add("mergeReplaceObjects", delegate (string v) { mergeReplaceObjects = (v != null); });
options.Add("s|skip-assets", delegate(string v) { skipAssets = (v != null); });
options.Add("force-assets", delegate(string v) { forceAssets = (v != null); });
options.Add("merge-terrain", delegate(string v) { mergeTerrain = (v != null); });
options.Add("force-terrain", delegate (string v) { mergeTerrain = (v != null); }); // downward compatibility
options.Add("forceterrain", delegate (string v) { mergeTerrain = (v != null); }); // downward compatibility
@@ -216,6 +218,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver
Dictionary<string, object> archiveOptions = new Dictionary<string, object>();
if (mergeOar) archiveOptions.Add("merge", null);
if (skipAssets) archiveOptions.Add("skipAssets", null);
if (forceAssets) archiveOptions.Add("forceAssets", null);
if (mergeReplaceObjects) archiveOptions.Add("mReplaceObjects", null);
if (mergeTerrain) archiveOptions.Add("merge-terrain", null);
if (mergeParcels) archiveOptions.Add("merge-parcels", null);

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

@@ -150,7 +150,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver
if(asset == null)
{
m_notFoundAssetUuids.Add(new UUID(thiskey));
m_notFoundAssetUuids.Add(kvp.Key);
continue;
}