aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes/ScenePresence.cs
diff options
context:
space:
mode:
authorAliciaRaven2016-12-10 18:03:05 +0000
committerAliciaRaven2016-12-10 18:03:05 +0000
commitd49a5374c37967110a8bf11844893f62951878ee (patch)
treec02cadf9613bbe4c33e042ef77141567777d9b65 /OpenSim/Region/Framework/Scenes/ScenePresence.cs
parentdo not try xbakes on HG (diff)
downloadopensim-SC_OLD-d49a5374c37967110a8bf11844893f62951878ee.zip
opensim-SC_OLD-d49a5374c37967110a8bf11844893f62951878ee.tar.gz
opensim-SC_OLD-d49a5374c37967110a8bf11844893f62951878ee.tar.bz2
opensim-SC_OLD-d49a5374c37967110a8bf11844893f62951878ee.tar.xz
Make it more unlikely that a script teleport will be caught by default region landing point.
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/ScenePresence.cs')
-rw-r--r--OpenSim/Region/Framework/Scenes/ScenePresence.cs2
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index d501b7f..463f6c8 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -2044,7 +2044,7 @@ namespace OpenSim.Region.Framework.Scenes
2044 } 2044 }
2045 2045
2046 // Check Default Location (Also See EntityTransferModule.TeleportAgentWithinRegion) 2046 // Check Default Location (Also See EntityTransferModule.TeleportAgentWithinRegion)
2047 if (AbsolutePosition.X == 128f && AbsolutePosition.Y == 128f) 2047 if (AbsolutePosition.X == 128f && AbsolutePosition.Y == 128f && AbsolutePosition.Z == 22.5f)
2048 AbsolutePosition = Scene.RegionInfo.DefaultLandingPoint; 2048 AbsolutePosition = Scene.RegionInfo.DefaultLandingPoint;
2049 2049
2050 if (!MakeRootAgent(AbsolutePosition, flying, ref look)) 2050 if (!MakeRootAgent(AbsolutePosition, flying, ref look))