diff --git a/OpenSim/Services/LLLoginService/LLLoginService.cs b/OpenSim/Services/LLLoginService/LLLoginService.cs
index be9003c8fd..173172ec41 100755
--- a/OpenSim/Services/LLLoginService/LLLoginService.cs
+++ b/OpenSim/Services/LLLoginService/LLLoginService.cs
@@ -721,6 +721,8 @@ namespace OpenSim.Services.LLLoginService
                 else
                 {
                     position = pinfo.LastPosition;
+                    position.X = Util.Clamp(position.X, 0.5f, region.RegionSizeX - 0.5f);
+                    position.Y = Util.Clamp(position.Y, 0.5f, region.RegionSizeY - 0.5f);
                     lookAt = pinfo.LastLookAt;
                 }