1 files changed, 6 insertions, 0 deletions

diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index e344da3..7f1936e 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -2494,6 +2494,12 @@ namespace OpenSim.Region.Framework.Scenes
 
             if (!agent.child)
             {
+                if (agent.startpos.X > (int)Constants.RegionSize - 1)
+                    agent.startpos.X = (int)Constants.RegionSize - 1;
+
+                if (agent.startpos.Y > (int)Constants.RegionSize - 1)
+                    agent.startpos.Y = (int)Constants.RegionSize - 1;
+
                 // Honor parcel landing type and position.
                 ILandObject land = LandChannel.GetLandObject(agent.startpos.X, agent.startpos.Y);
                 if (land != null)