ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-08 02:05:34 +08:00
Code Issues Packages Projects Releases Wiki Activity

give BlockingCollection more chances

Browse Source
This commit is contained in:
UbitUmarov
2018-01-22 02:42:50 +00:00
parent d4a5454f3c
commit 437369778d
3 changed files with 12 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
OpenSim/Region/ClientStack/Linden/Caps/WebFetchInvDescModule.cs
View File

@@ -232,6 +232,7 @@ namespace OpenSim.Region.ClientStack.Linden
m_workerThreads = null;
}
}
// m_queue.Dispose();
}
public string Name { get { return "WebFetchInvDescModule"; } }

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

@@ -435,7 +435,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver
WorkManager.RunInThread(o =>
{
Thread.Sleep(15000);
m_log.Info("[ARCHIVER]: Starting scripts in scene objects");
m_log.Info("[ARCHIVER]: Starting scripts in scene objects...");
foreach (DearchiveContext sceneContext in sceneContexts.Values)
{
@@ -447,6 +447,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver
sceneContext.SceneObjects.Clear();
}
m_log.Info("[ARCHIVER]: Start scripts done");
}, null, string.Format("ReadArchiveStartScripts (request {0})", m_requestId));
}
@@ -945,10 +946,6 @@ namespace OpenSim.Region.CoreModules.World.Archiver
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);
return true;
@@ -958,10 +955,6 @@ namespace OpenSim.Region.CoreModules.World.Archiver
{
sbyte assetType = ArchiveConstants.EXTENSION_TO_ASSET_TYPE[extension];
if(assetType == -2)
{
}
if (assetType == (sbyte)AssetType.Unknown)
{
m_log.WarnFormat("[ARCHIVER]: Importing {0} byte asset {1} with unknown type", data.Length, uuid);