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

Improve handling of slow asset requests which previously could be successful but still be ignored

Browse Source
This commit is contained in:
Melanie
2020-10-13 17:36:54 +01:00
parent 5b70cdef11
commit 4105bf350e
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -129,7 +129,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver
return;
}
m_timeOutTimer = new System.Timers.Timer(60000);
m_timeOutTimer = new System.Timers.Timer(950000);
m_timeOutTimer .AutoReset = false;
m_timeOutTimer.Elapsed += OnTimeout;
m_timeout = false;
@@ -143,8 +143,10 @@ namespace OpenSim.Region.CoreModules.World.Archiver
{
m_timeOutTimer.Enabled = true;
AssetBase asset = m_assetService.Get(thiskey);
if(m_timeout)
if(m_timeout && asset == null)
break;
else
m_timeout = false;
m_timeOutTimer.Enabled = false;