diff --git a/OpenSim/Region/Environment/Scenes/Scene.cs b/OpenSim/Region/Environment/Scenes/Scene.cs
index 64c443dd47..101bac30a3 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(