aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes
diff options
context:
space:
mode:
authorUbitUmarov2012-02-15 19:44:54 +0000
committerMelanie2012-02-15 22:04:17 +0100
commit3bffdddc9d0f0f62d7cf4bc6c271a865052ee119 (patch)
treeb238999aacfae73ae2c802eb6a3650a3ac6a130a /OpenSim/Region/Framework/Scenes
parent try to make crossings work better. chode no longer prevents crossings i hope (diff)
downloadopensim-SC_OLD-3bffdddc9d0f0f62d7cf4bc6c271a865052ee119.zip
opensim-SC_OLD-3bffdddc9d0f0f62d7cf4bc6c271a865052ee119.tar.gz
opensim-SC_OLD-3bffdddc9d0f0f62d7cf4bc6c271a865052ee119.tar.bz2
opensim-SC_OLD-3bffdddc9d0f0f62d7cf4bc6c271a865052ee119.tar.xz
don't freeze with a sitted avatar in a border without other sim. Still messy :(
Diffstat (limited to 'OpenSim/Region/Framework/Scenes')
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs9
1 files changed, 8 insertions, 1 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
index d964a6f..e7c6ee8 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
@@ -537,8 +537,15 @@ namespace OpenSim.Region.Framework.Scenes
537 return; 537 return;
538 } 538 }
539 } 539 }
540 else if (RootPart.PhysActor != null)
541 {
542 RootPart.PhysActor.CrossingFailure();
543 }
540 544
541 val = AbsolutePosition; 545 Vector3 oldp = AbsolutePosition;
546 val.X = Util.Clamp<float>(oldp.X, 0.5f, (float)Constants.RegionSize - 0.5f);
547 val.Y = Util.Clamp<float>(oldp.Y, 0.5f, (float)Constants.RegionSize - 0.5f);
548 val.Z = Util.Clamp<float>(oldp.Z, 0.5f, 4096.0f);
542 } 549 }
543 } 550 }
544 551