aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorJustin Clarke Casey2009-06-12 14:00:50 +0000
committerJustin Clarke Casey2009-06-12 14:00:50 +0000
commit15b8641befea2d67c161928c949db7d5a3064405 (patch)
tree064a03aae25005c929044cf66ce71f70edb7469e /OpenSim
parent* minor: remove warning from unused field (diff)
downloadopensim-SC_OLD-15b8641befea2d67c161928c949db7d5a3064405.zip
opensim-SC_OLD-15b8641befea2d67c161928c949db7d5a3064405.tar.gz
opensim-SC_OLD-15b8641befea2d67c161928c949db7d5a3064405.tar.bz2
opensim-SC_OLD-15b8641befea2d67c161928c949db7d5a3064405.tar.xz
* minor: if OAR saving receives assets after timeout, just print warning, don't accidentally go on to process them
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Region/CoreModules/World/Archiver/AssetsRequest.cs2
1 files changed, 2 insertions, 0 deletions
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
220 m_log.WarnFormat( 220 m_log.WarnFormat(
221 "[ARCHIVER]: Received information about asset {0} after archive save abortion. Ignoring.", 221 "[ARCHIVER]: Received information about asset {0} after archive save abortion. Ignoring.",
222 id); 222 id);
223
224 return;
223 } 225 }
224 226
225 if (asset != null) 227 if (asset != null)