OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

load oar; activate area cliping if bounding-origin option is given. as help says

0.9.0-post-fixes
UbitUmarov 2016-09-27 15:24:05 +01:00
parent 6779f41e21
commit f6e77e3935
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -227,8 +227,8 @@ namespace OpenSim.Region.CoreModules.World.Archiver
if (boOption != m_boundingOrigin) if (boOption != m_boundingOrigin)
{ {
m_boundingOrigin = boOption; m_boundingOrigin = boOption;
m_boundingBox = true;
} }
m_boundingBox = true;
} }
if (options.ContainsKey("bounding-size")) if (options.ContainsKey("bounding-size"))
@ -936,14 +936,24 @@ namespace OpenSim.Region.CoreModules.World.Archiver
if (m_assetService.GetMetadata(uuid) != null) if (m_assetService.GetMetadata(uuid) != null)
{ {
sbyte asype = ArchiveConstants.EXTENSION_TO_ASSET_TYPE[extension];
if(asype == -2)
{
}
// m_log.DebugFormat("[ARCHIVER]: found existing asset {0}",uuid); // m_log.DebugFormat("[ARCHIVER]: found existing asset {0}",uuid);
return true; return true;
} }
if (ArchiveConstants.EXTENSION_TO_ASSET_TYPE.ContainsKey(extension)) if (ArchiveConstants.EXTENSION_TO_ASSET_TYPE.ContainsKey(extension))
{ {
sbyte assetType = ArchiveConstants.EXTENSION_TO_ASSET_TYPE[extension]; sbyte assetType = ArchiveConstants.EXTENSION_TO_ASSET_TYPE[extension];
if(assetType == -2)
{
}
if (assetType == (sbyte)AssetType.Unknown) if (assetType == (sbyte)AssetType.Unknown)
{ {
m_log.WarnFormat("[ARCHIVER]: Importing {0} byte asset {1} with unknown type", data.Length, uuid); m_log.WarnFormat("[ARCHIVER]: Importing {0} byte asset {1} with unknown type", data.Length, uuid);