diff options
Diffstat (limited to 'OpenSim')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/ScenePresence.cs | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs index d2c6a29..c35df08 100644 --- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs +++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs | |||
@@ -915,10 +915,10 @@ namespace OpenSim.Region.Framework.Scenes | |||
915 | //If they're TP'ing in or logging in, we haven't had time to add any known child regions yet. | 915 | //If they're TP'ing in or logging in, we haven't had time to add any known child regions yet. |
916 | //This has the unfortunate consequence that if somebody is TP'ing who is already a child agent, | 916 | //This has the unfortunate consequence that if somebody is TP'ing who is already a child agent, |
917 | //they'll bypass the landing point. But I can't think of any decent way of fixing this. | 917 | //they'll bypass the landing point. But I can't think of any decent way of fixing this. |
918 | if (KnownChildRegionHandles.Count == 0) | 918 | ILandObject land = m_scene.LandChannel.GetLandObject(pos.X, pos.Y); |
919 | if (land != null) | ||
919 | { | 920 | { |
920 | ILandObject land = m_scene.LandChannel.GetLandObject(pos.X, pos.Y); | 921 | if (KnownChildRegionHandles.Count == 0) |
921 | if (land != null) | ||
922 | { | 922 | { |
923 | //Don't restrict gods, estate managers, or land owners to the TP point. This behaviour mimics agni. | 923 | //Don't restrict gods, estate managers, or land owners to the TP point. This behaviour mimics agni. |
924 | if (land.LandData.LandingType == (byte)1 && land.LandData.UserLocation != Vector3.Zero && UserLevel < 200 && !m_scene.RegionInfo.EstateSettings.IsEstateManager(m_uuid) && land.LandData.OwnerID != m_uuid) | 924 | if (land.LandData.LandingType == (byte)1 && land.LandData.UserLocation != Vector3.Zero && UserLevel < 200 && !m_scene.RegionInfo.EstateSettings.IsEstateManager(m_uuid) && land.LandData.OwnerID != m_uuid) |
@@ -926,6 +926,8 @@ namespace OpenSim.Region.Framework.Scenes | |||
926 | pos = land.LandData.UserLocation; | 926 | pos = land.LandData.UserLocation; |
927 | } | 927 | } |
928 | } | 928 | } |
929 | |||
930 | land.SendLandUpdateToClient(ControllingClient); | ||
929 | } | 931 | } |
930 | 932 | ||
931 | if (pos.X < 0 || pos.Y < 0 || pos.Z < 0) | 933 | if (pos.X < 0 || pos.Y < 0 || pos.Z < 0) |