From be6edefcfb6574c1d011809315bfc464c479844c Mon Sep 17 00:00:00 2001
From: Teravus Ovares
Date: Fri, 15 Feb 2008 21:35:52 +0000
Subject: * ODE Stability update 4 :D * Changed the way meshing requests get
 sent to the ODEPlugin * Numerous other fixes

---
 OpenSim/Region/Environment/Scenes/Scene.cs | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

(limited to 'OpenSim/Region/Environment/Scenes/Scene.cs')

diff --git a/OpenSim/Region/Environment/Scenes/Scene.cs b/OpenSim/Region/Environment/Scenes/Scene.cs
index 708da15..d8cb11c 100644
--- a/OpenSim/Region/Environment/Scenes/Scene.cs
+++ b/OpenSim/Region/Environment/Scenes/Scene.cs
@@ -737,12 +737,27 @@ namespace OpenSim.Region.Environment.Scenes
                 m_statsReporter.addOtherMS(otherMS);
                 m_statsReporter.SetActiveScripts(m_innerScene.GetActiveScripts());
                 m_statsReporter.addScriptLines(m_innerScene.GetScriptLPS());
-                
+
             }
             catch (NotImplementedException)
             {
                 throw;
             }
+            catch (System.AccessViolationException e)
+            {
+                m_log.Error("[Scene]: Failed with exception " + e.ToString() + " On Region: " + RegionInfo.RegionName);
+
+            }
+            catch (System.NullReferenceException e)
+            {
+                m_log.Error("[Scene]: Failed with exception " + e.ToString() + " On Region: " + RegionInfo.RegionName);
+
+            }
+            catch (System.InvalidOperationException e)
+            {
+                m_log.Error("[Scene]: Failed with exception " + e.ToString() + " On Region: " + RegionInfo.RegionName);
+
+            }
             catch (Exception e)
             {
                 m_log.Error("[Scene]: Failed with exception " + e.ToString() + " On Region: " + RegionInfo.RegionName);
-- 
cgit v1.1