* The simulator now checks the parcel at the position that you get put by the grid server to see if you set it's landing point to a specified landing point. If you did, and the landing point isn't LLVector3.Zero, it puts you at the configured landing point.

* Currently the grid server sticks you at 128x128x128..  so that means it'll use whatever parcel is at that location to get this information.   This allows greater customization of where people log-into and teleport-to if done right.

1 files changed, 10 insertions, 0 deletions

diff --git a/OpenSim/Region/Environment/Scenes/Scene.cs b/OpenSim/Region/Environment/Scenes/Scene.cs
index 64c443d..101bac3 100644
--- a/OpenSim/Region/Environment/Scenes/Scene.cs
+++ b/OpenSim/Region/Environment/Scenes/Scene.cs
@@ -1700,6 +1700,16 @@ namespace OpenSim.Region.Environment.Scenes
                 if (!agent.child)
                 {
                     AddCapsHandler(agent.AgentID);
+
+                    // Honor parcel landing type and position.
+                    ILandObject land = LandChannel.getLandObject(agent.startpos.X, agent.startpos.Y);
+                    if (land != null)
+                    {
+                        if (land.landData.landingType == (byte)1 && land.landData.userLocation != LLVector3.Zero)
+                        {
+                            agent.startpos = land.landData.userLocation;
+                        }
+                    }
                 }
                 
                 m_log.DebugFormat(