Better error handling if Load OAR or Save OAR fail

1 files changed, 10 insertions, 1 deletions

diff --git a/OpenSim/Region/CoreModules/World/Archiver/ArchiveWriteRequestPreparation.cs b/OpenSim/Region/CoreModules/World/Archiver/ArchiveWriteRequestPreparation.cs
index eabe46e..384d81b 100644
--- a/OpenSim/Region/CoreModules/World/Archiver/ArchiveWriteRequestPreparation.cs
+++ b/OpenSim/Region/CoreModules/World/Archiver/ArchiveWriteRequestPreparation.cs
@@ -124,6 +124,9 @@ namespace OpenSim.Region.CoreModules.World.Archiver
             if (options.ContainsKey("noassets") && (bool)options["noassets"])
                 SaveAssets = false;
 
+            // Whether someone else (i.e., ReceivedAllAssets()) is responsible for calling TriggerOarFileSaved() when we're done
+            bool eventHandled = false;
+
             try
             {
                 Dictionary<UUID, AssetType> assetUuids = new Dictionary<UUID, AssetType>();
@@ -230,15 +233,21 @@ namespace OpenSim.Region.CoreModules.World.Archiver
                             m_scene.RegionInfo.ScopeID, options, awre.ReceivedAllAssets);
 
                     Util.FireAndForget(o => ar.Execute());
+                    eventHandled = true;
                 }
                 else
                 {
                     awre.ReceivedAllAssets(new List<UUID>(), new List<UUID>());
+                    eventHandled = true;
                 }
             }
-            catch (Exception) 
+            catch (Exception e)
             {
                 m_saveStream.Close();
+                
+                if (!eventHandled)
+                    m_scene.EventManager.TriggerOarFileSaved(m_requestId, e.ToString());
+                
                 throw;
             }    
         }