Merge branch 'master' into careminster

Conflicts:
	OpenSim/Data/MySQL/MySQLXAssetData.cs

1 files changed, 0 insertions, 7 deletions

diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index 753effc..b50ccc4 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -1229,9 +1229,6 @@ namespace OpenSim.Region.Framework.Scenes
                 while (!shuttingdown)
                     Update();
             }
-            catch (ThreadAbortException)
-            {
-            }
             finally
             {
                 Monitor.Pulse(m_heartbeatLock);
@@ -1409,10 +1406,6 @@ namespace OpenSim.Region.Framework.Scenes
                     }
                 }
             }
-            catch (NotImplementedException)
-            {
-                throw;
-            }
             catch (Exception e)
             {
                 m_log.ErrorFormat(