diff options
| author | Melanie Thielker | 2016-12-10 18:37:41 +0000 |
|---|---|---|
| committer | Melanie Thielker | 2016-12-10 18:37:41 +0000 |
| commit | 96bdc5e185ec8df6237bf9dddd9af70e12c7c349 (patch) | |
| tree | 4a8b68d806bc86c3d81ce1e620640dff04ccdb62 | |
| parent | Fix OpenSim bombing when a MySQL connection string doesn't contain a password. (diff) | |
| parent | Make it more unlikely that a script teleport will be caught by default region... (diff) | |
| download | opensim-SC_OLD-96bdc5e185ec8df6237bf9dddd9af70e12c7c349.zip opensim-SC_OLD-96bdc5e185ec8df6237bf9dddd9af70e12c7c349.tar.gz opensim-SC_OLD-96bdc5e185ec8df6237bf9dddd9af70e12c7c349.tar.bz2 opensim-SC_OLD-96bdc5e185ec8df6237bf9dddd9af70e12c7c349.tar.xz | |
Merge branch 'master' of opensimulator.org:/var/git/opensim
| -rw-r--r-- | OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs | 2 | ||||
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/ScenePresence.cs | 2 |
2 files changed, 2 insertions, 2 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 |
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)) |