From 7371c7662a05d2c1dae1c110905817bb873cf934 Mon Sep 17 00:00:00 2001
From: CasperW
Date: Sat, 26 Dec 2009 18:14:12 +0100
Subject: Fix for landing points. Only one scenario is not fully covered by
 this change, and that is people who teleport from neighbouring regions, who
 won't get affected by the landing point.

---
 OpenSim/Region/Framework/Scenes/Scene.cs | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'OpenSim/Region/Framework/Scenes/Scene.cs')

diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index 265129c..37734f4 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -3460,6 +3460,7 @@ namespace OpenSim.Region.Framework.Scenes
                     }
                 }
                 // Honor parcel landing type and position.
+                /*
                 ILandObject land = LandChannel.GetLandObject(agent.startpos.X, agent.startpos.Y);
                 if (land != null)
                 {
@@ -3468,6 +3469,7 @@ namespace OpenSim.Region.Framework.Scenes
                         agent.startpos = land.LandData.UserLocation;
                     }
                 }
+                */// This is now handled properly in ScenePresence.MakeRootAgent
             }
 
             m_authenticateHandler.AddNewCircuit(agent.circuitcode, agent);
-- 
cgit v1.1