OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' of opensimulator.org:/var/git/opensim

melanie
Melanie Thielker 2016-12-10 18:37:41 +00:00
parent 5ad8bceb1d d49a5374c3
commit 96bdc5e185
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
View File

@ -456,7 +456,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
} }
// Check Default Location (Also See ScenePresence.CompleteMovement) // Check Default Location (Also See ScenePresence.CompleteMovement)
if (position.X == 128f && position.Y == 128f) if (position.X == 128f && position.Y == 128f && position.Z == 22.5f)
position = sp.Scene.RegionInfo.DefaultLandingPoint; position = sp.Scene.RegionInfo.DefaultLandingPoint;
// TODO: Get proper AVG Height // TODO: Get proper AVG Height

2
OpenSim/Region/Framework/Scenes/ScenePresence.cs
View File

@ -2044,7 +2044,7 @@ namespace OpenSim.Region.Framework.Scenes
} }
// Check Default Location (Also See EntityTransferModule.TeleportAgentWithinRegion) // Check Default Location (Also See EntityTransferModule.TeleportAgentWithinRegion)
if (AbsolutePosition.X == 128f && AbsolutePosition.Y == 128f) if (AbsolutePosition.X == 128f && AbsolutePosition.Y == 128f && AbsolutePosition.Z == 22.5f)
AbsolutePosition = Scene.RegionInfo.DefaultLandingPoint; AbsolutePosition = Scene.RegionInfo.DefaultLandingPoint;
if (!MakeRootAgent(AbsolutePosition, flying, ref look)) if (!MakeRootAgent(AbsolutePosition, flying, ref look))