From 15b8641befea2d67c161928c949db7d5a3064405 Mon Sep 17 00:00:00 2001 From: Justin Clarke Casey Date: Fri, 12 Jun 2009 14:00:50 +0000 Subject: * minor: if OAR saving receives assets after timeout, just print warning, don't accidentally go on to process them --- OpenSim/Region/CoreModules/World/Archiver/AssetsRequest.cs | 2 ++ 1 file changed, 2 insertions(+) diff --git a/OpenSim/Region/CoreModules/World/Archiver/AssetsRequest.cs b/OpenSim/Region/CoreModules/World/Archiver/AssetsRequest.cs index 287083a..82803bf 100644 --- a/OpenSim/Region/CoreModules/World/Archiver/AssetsRequest.cs +++ b/OpenSim/Region/CoreModules/World/Archiver/AssetsRequest.cs @@ -220,6 +220,8 @@ namespace OpenSim.Region.CoreModules.World.Archiver m_log.WarnFormat( "[ARCHIVER]: Received information about asset {0} after archive save abortion. Ignoring.", id); + + return; } if (asset != null) -- cgit v1.1