From 4105bf350e9fa4e2225f981eeefa06afe10ae4f3 Mon Sep 17 00:00:00 2001
From: Melanie <melanie@opensimulator.org>
Date: Tue, 13 Oct 2020 17:36:54 +0100
Subject: [PATCH] Improve handling of slow asset requests which previously
 could be successful but still be ignored

---
 OpenSim/Region/CoreModules/World/Archiver/AssetsRequest.cs | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/OpenSim/Region/CoreModules/World/Archiver/AssetsRequest.cs b/OpenSim/Region/CoreModules/World/Archiver/AssetsRequest.cs
index 9a0f16b0b1..7e8234d058 100644
--- a/OpenSim/Region/CoreModules/World/Archiver/AssetsRequest.cs
+++ b/OpenSim/Region/CoreModules/World/Archiver/AssetsRequest.cs
@@ -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;