Revert "Better error handling if Load OAR or Save OAR fail"

This reverts commit 65c88b2ff4e2616fa5c1d4c5e75298ed1eb1c0d8.

Yet again I accidentally committed something whilst evaluating it.

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
             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>();
@@ -233,21 +230,15 @@ 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 e)
+            catch (Exception) 
             {
                 m_saveStream.Close();
-                
-                if (!eventHandled)
-                    m_scene.EventManager.TriggerOarFileSaved(m_requestId, e.ToString());
-                
                 throw;
             }    
         }