aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/CoreModules/World/Archiver/ArchiveWriteRequestPreparation.cs
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region/CoreModules/World/Archiver/ArchiveWriteRequestPreparation.cs')
-rw-r--r--OpenSim/Region/CoreModules/World/Archiver/ArchiveWriteRequestPreparation.cs11
1 files changed, 1 insertions, 10 deletions
diff --git a/OpenSim/Region/CoreModules/World/Archiver/ArchiveWriteRequestPreparation.cs b/OpenSim/Region/CoreModules/World/Archiver/ArchiveWriteRequestPreparation.cs
index 384d81b..eabe46e 100644
--- a/OpenSim/Region/CoreModules/World/Archiver/ArchiveWriteRequestPreparation.cs
+++ b/OpenSim/Region/CoreModules/World/Archiver/ArchiveWriteRequestPreparation.cs
@@ -124,9 +124,6 @@ namespace OpenSim.Region.CoreModules.World.Archiver
124 if (options.ContainsKey("noassets") && (bool)options["noassets"]) 124 if (options.ContainsKey("noassets") && (bool)options["noassets"])
125 SaveAssets = false; 125 SaveAssets = false;
126 126
127 // Whether someone else (i.e., ReceivedAllAssets()) is responsible for calling TriggerOarFileSaved() when we're done
128 bool eventHandled = false;
129
130 try 127 try
131 { 128 {
132 Dictionary<UUID, AssetType> assetUuids = new Dictionary<UUID, AssetType>(); 129 Dictionary<UUID, AssetType> assetUuids = new Dictionary<UUID, AssetType>();
@@ -233,21 +230,15 @@ namespace OpenSim.Region.CoreModules.World.Archiver
233 m_scene.RegionInfo.ScopeID, options, awre.ReceivedAllAssets); 230 m_scene.RegionInfo.ScopeID, options, awre.ReceivedAllAssets);
234 231
235 Util.FireAndForget(o => ar.Execute()); 232 Util.FireAndForget(o => ar.Execute());
236 eventHandled = true;
237 } 233 }
238 else 234 else
239 { 235 {
240 awre.ReceivedAllAssets(new List<UUID>(), new List<UUID>()); 236 awre.ReceivedAllAssets(new List<UUID>(), new List<UUID>());
241 eventHandled = true;
242 } 237 }
243 } 238 }
244 catch (Exception e) 239 catch (Exception)
245 { 240 {
246 m_saveStream.Close(); 241 m_saveStream.Close();
247
248 if (!eventHandled)
249 m_scene.EventManager.TriggerOarFileSaved(m_requestId, e.ToString());
250
251 throw; 242 throw;
252 } 243 }
253 } 244 }