aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorRevolution2010-01-23 20:29:02 -0600
committerMelanie2010-01-24 11:35:30 +0000
commitfe06f0dd05fa783a6d3d7e7aa2b5614c9825e8fe (patch)
tree6446a6c41afdf83d764da73d4899edb9c0dc9641 /OpenSim
parentAdded some prebuild refs needed for mono building (diff)
downloadopensim-SC_OLD-fe06f0dd05fa783a6d3d7e7aa2b5614c9825e8fe.zip
opensim-SC_OLD-fe06f0dd05fa783a6d3d7e7aa2b5614c9825e8fe.tar.gz
opensim-SC_OLD-fe06f0dd05fa783a6d3d7e7aa2b5614c9825e8fe.tar.bz2
opensim-SC_OLD-fe06f0dd05fa783a6d3d7e7aa2b5614c9825e8fe.tar.xz
Fixes Region Crossings on a prim.
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Region/Framework/Scenes/ScenePresence.cs10
1 files changed, 9 insertions, 1 deletions
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
2779 protected void CrossToNewRegion() 2779 protected void CrossToNewRegion()
2780 { 2780 {
2781 InTransit(); 2781 InTransit();
2782 m_scene.CrossAgentToNewRegion(this, m_physicsActor.Flying); 2782 try
2783 {
2784 m_scene.CrossAgentToNewRegion(this, m_physicsActor.Flying);
2785 }
2786 catch(Exception ex)
2787 {
2788 m_scene.CrossAgentToNewRegion(this, false);
2789 }
2790
2783 } 2791 }
2784 2792
2785 public void InTransit() 2793 public void InTransit()