aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region')
-rw-r--r--OpenSim/Region/ClientStack/Linden/Caps/WebFetchInvDescModule.cs1
-rw-r--r--OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs11
2 files changed, 3 insertions, 9 deletions
diff --git a/OpenSim/Region/ClientStack/Linden/Caps/WebFetchInvDescModule.cs b/OpenSim/Region/ClientStack/Linden/Caps/WebFetchInvDescModule.cs
index c02bcb0..f6d49ee 100644
--- a/OpenSim/Region/ClientStack/Linden/Caps/WebFetchInvDescModule.cs
+++ b/OpenSim/Region/ClientStack/Linden/Caps/WebFetchInvDescModule.cs
@@ -232,6 +232,7 @@ namespace OpenSim.Region.ClientStack.Linden
232 m_workerThreads = null; 232 m_workerThreads = null;
233 } 233 }
234 } 234 }
235// m_queue.Dispose();
235 } 236 }
236 237
237 public string Name { get { return "WebFetchInvDescModule"; } } 238 public string Name { get { return "WebFetchInvDescModule"; } }
diff --git a/OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs b/OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs
index 99ff9b5..e5c9841 100644
--- a/OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs
+++ b/OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs
@@ -435,7 +435,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver
435 WorkManager.RunInThread(o => 435 WorkManager.RunInThread(o =>
436 { 436 {
437 Thread.Sleep(15000); 437 Thread.Sleep(15000);
438 m_log.Info("[ARCHIVER]: Starting scripts in scene objects"); 438 m_log.Info("[ARCHIVER]: Starting scripts in scene objects...");
439 439
440 foreach (DearchiveContext sceneContext in sceneContexts.Values) 440 foreach (DearchiveContext sceneContext in sceneContexts.Values)
441 { 441 {
@@ -447,6 +447,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver
447 447
448 sceneContext.SceneObjects.Clear(); 448 sceneContext.SceneObjects.Clear();
449 } 449 }
450 m_log.Info("[ARCHIVER]: Start scripts done");
450 }, null, string.Format("ReadArchiveStartScripts (request {0})", m_requestId)); 451 }, null, string.Format("ReadArchiveStartScripts (request {0})", m_requestId));
451 } 452 }
452 453
@@ -945,10 +946,6 @@ namespace OpenSim.Region.CoreModules.World.Archiver
945 if (m_assetService.GetMetadata(uuid) != null) 946 if (m_assetService.GetMetadata(uuid) != null)
946 { 947 {
947 sbyte asype = ArchiveConstants.EXTENSION_TO_ASSET_TYPE[extension]; 948 sbyte asype = ArchiveConstants.EXTENSION_TO_ASSET_TYPE[extension];
948 if(asype == -2)
949 {
950
951 }
952 949
953 // m_log.DebugFormat("[ARCHIVER]: found existing asset {0}",uuid); 950 // m_log.DebugFormat("[ARCHIVER]: found existing asset {0}",uuid);
954 return true; 951 return true;
@@ -958,10 +955,6 @@ namespace OpenSim.Region.CoreModules.World.Archiver
958 { 955 {
959 sbyte assetType = ArchiveConstants.EXTENSION_TO_ASSET_TYPE[extension]; 956 sbyte assetType = ArchiveConstants.EXTENSION_TO_ASSET_TYPE[extension];
960 957
961 if(assetType == -2)
962 {
963
964 }
965 if (assetType == (sbyte)AssetType.Unknown) 958 if (assetType == (sbyte)AssetType.Unknown)
966 { 959 {
967 m_log.WarnFormat("[ARCHIVER]: Importing {0} byte asset {1} with unknown type", data.Length, uuid); 960 m_log.WarnFormat("[ARCHIVER]: Importing {0} byte asset {1} with unknown type", data.Length, uuid);