From fe06f0dd05fa783a6d3d7e7aa2b5614c9825e8fe Mon Sep 17 00:00:00 2001
From: Revolution
Date: Sat, 23 Jan 2010 20:29:02 -0600
Subject: Fixes Region Crossings on a prim.

---
 OpenSim/Region/Framework/Scenes/ScenePresence.cs | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

(limited to 'OpenSim/Region/Framework/Scenes/ScenePresence.cs')

diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index 1c183f3..5562e51 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -2779,7 +2779,15 @@ namespace OpenSim.Region.Framework.Scenes
         protected void CrossToNewRegion()
         {
             InTransit();
-            m_scene.CrossAgentToNewRegion(this, m_physicsActor.Flying);
+            try
+            {
+            	m_scene.CrossAgentToNewRegion(this, m_physicsActor.Flying);
+            }
+            catch(Exception ex)
+            {
+            	m_scene.CrossAgentToNewRegion(this, false);
+            }
+
         }
 
         public void InTransit()
-- 
cgit v1.1