diff options
| author | AliciaRaven | 2016-12-10 18:03:05 +0000 |
|---|---|---|
| committer | AliciaRaven | 2016-12-10 18:03:05 +0000 |
| commit | d49a5374c37967110a8bf11844893f62951878ee (patch) | |
| tree | c02cadf9613bbe4c33e042ef77141567777d9b65 /OpenSim/Region/CoreModules/Framework | |
| parent | do not try xbakes on HG (diff) | |
| download | opensim-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/CoreModules/Framework')
| -rw-r--r-- | OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs index ad094b4..58d6cf2 100644 --- a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs +++ b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs | |||
| @@ -456,7 +456,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer | |||
| 456 | } | 456 | } |
| 457 | 457 | ||
| 458 | // Check Default Location (Also See ScenePresence.CompleteMovement) | 458 | // Check Default Location (Also See ScenePresence.CompleteMovement) |
| 459 | if (position.X == 128f && position.Y == 128f) | 459 | if (position.X == 128f && position.Y == 128f && position.Z == 22.5f) |
| 460 | position = sp.Scene.RegionInfo.DefaultLandingPoint; | 460 | position = sp.Scene.RegionInfo.DefaultLandingPoint; |
| 461 | 461 | ||
| 462 | // TODO: Get proper AVG Height | 462 | // TODO: Get proper AVG Height |