aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region
diff options
context:
space:
mode:
authorUbitUmarov2016-09-27 15:24:05 +0100
committerUbitUmarov2016-09-27 15:24:05 +0100
commitf6e77e3935bd444eaaf6e24a4b538c3250546577 (patch)
tree30d8afdb07307d5c16201e7d676dea35bd665b12 /OpenSim/Region
parentfix linknumbers when unlink the root prim (diff)
downloadopensim-SC-f6e77e3935bd444eaaf6e24a4b538c3250546577.zip
opensim-SC-f6e77e3935bd444eaaf6e24a4b538c3250546577.tar.gz
opensim-SC-f6e77e3935bd444eaaf6e24a4b538c3250546577.tar.bz2
opensim-SC-f6e77e3935bd444eaaf6e24a4b538c3250546577.tar.xz
load oar; activate area cliping if bounding-origin option is given. as help says
Diffstat (limited to 'OpenSim/Region')
-rw-r--r--OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs14
1 files changed, 12 insertions, 2 deletions
diff --git a/OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs b/OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs
index 2d590fc..f523af1 100644
--- a/OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs
+++ b/OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs
@@ -227,8 +227,8 @@ namespace OpenSim.Region.CoreModules.World.Archiver
227 if (boOption != m_boundingOrigin) 227 if (boOption != m_boundingOrigin)
228 { 228 {
229 m_boundingOrigin = boOption; 229 m_boundingOrigin = boOption;
230 m_boundingBox = true;
231 } 230 }
231 m_boundingBox = true;
232 } 232 }
233 233
234 if (options.ContainsKey("bounding-size")) 234 if (options.ContainsKey("bounding-size"))
@@ -936,14 +936,24 @@ namespace OpenSim.Region.CoreModules.World.Archiver
936 936
937 if (m_assetService.GetMetadata(uuid) != null) 937 if (m_assetService.GetMetadata(uuid) != null)
938 { 938 {
939 sbyte asype = ArchiveConstants.EXTENSION_TO_ASSET_TYPE[extension];
940 if(asype == -2)
941 {
942
943 }
944
939 // m_log.DebugFormat("[ARCHIVER]: found existing asset {0}",uuid); 945 // m_log.DebugFormat("[ARCHIVER]: found existing asset {0}",uuid);
940 return true; 946 return true;
941 } 947 }
942 948
943 if (ArchiveConstants.EXTENSION_TO_ASSET_TYPE.ContainsKey(extension)) 949 if (ArchiveConstants.EXTENSION_TO_ASSET_TYPE.ContainsKey(extension))
944 { 950 {
945 sbyte assetType = ArchiveConstants.EXTENSION_TO_ASSET_TYPE[extension]; 951 sbyte assetType = ArchiveConstants.EXTENSION_TO_ASSET_TYPE[extension];
946 952
953 if(assetType == -2)
954 {
955
956 }
947 if (assetType == (sbyte)AssetType.Unknown) 957 if (assetType == (sbyte)AssetType.Unknown)
948 { 958 {
949 m_log.WarnFormat("[ARCHIVER]: Importing {0} byte asset {1} with unknown type", data.Length, uuid); 959 m_log.WarnFormat("[ARCHIVER]: Importing {0} byte asset {1} with unknown type", data.Length, uuid);