aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/CoreModules
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2012-03-10 03:11:28 +0000
committerJustin Clark-Casey (justincc)2012-03-10 03:11:28 +0000
commit05e821c4442d4d3825367ba8f8c544d250cffd2d (patch)
treed2ab97356123ea2dae185f7b1c8bece0d823fb42 /OpenSim/Region/CoreModules
parentminor: In IAR save, log when we start adding the control file rather than say... (diff)
downloadopensim-SC_OLD-05e821c4442d4d3825367ba8f8c544d250cffd2d.zip
opensim-SC_OLD-05e821c4442d4d3825367ba8f8c544d250cffd2d.tar.gz
opensim-SC_OLD-05e821c4442d4d3825367ba8f8c544d250cffd2d.tar.bz2
opensim-SC_OLD-05e821c4442d4d3825367ba8f8c544d250cffd2d.tar.xz
Fix TestSaveOarNoAssets() by not launch a no-assets request on a separate thread.
This was previous behaviour anyway.
Diffstat (limited to 'OpenSim/Region/CoreModules')
-rw-r--r--OpenSim/Region/CoreModules/World/Archiver/ArchiveWriteRequestPreparation.cs2
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/CoreModules/World/Archiver/ArchiveWriteRequestPreparation.cs b/OpenSim/Region/CoreModules/World/Archiver/ArchiveWriteRequestPreparation.cs
index aef3ad3..4d459bf 100644
--- a/OpenSim/Region/CoreModules/World/Archiver/ArchiveWriteRequestPreparation.cs
+++ b/OpenSim/Region/CoreModules/World/Archiver/ArchiveWriteRequestPreparation.cs
@@ -230,7 +230,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver
230 } 230 }
231 else 231 else
232 { 232 {
233 Util.FireAndForget(o => awre.ReceivedAllAssets(new List<UUID>(), new List<UUID>())); 233 awre.ReceivedAllAssets(new List<UUID>(), new List<UUID>());
234 } 234 }
235 } 235 }
236 catch (Exception) 236 catch (Exception)