Hopefully fixed mantis bug #318 (exception when a prim moves across a border, for now have stopped prims moving beyond a regions area, will add sending prims from one region to another soon).

1 files changed, 20 insertions, 1 deletions

diff --git a/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs
index ba6f6ea..cbf92a8 100644
--- a/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs
+++ b/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs
@@ -83,11 +83,30 @@ namespace OpenSim.Region.Environment.Scenes
             get { return m_rootPart.GroupPosition; }
             set
             {
+                LLVector3 val = value;
+                if (val.X > 255.6f)
+                {
+                    val.X = 255.6f;
+                }
+                else if (val.X < 0.4f)
+                {
+                    val.X = 0.4f;
+                }
+
+                if (val.Y > 255.6f)
+                {
+                    val.Y = 255.6f;
+                }
+                else if (val.Y < 0.4f)
+                {
+                    val.Y = 0.4f;
+                }
+
                 lock (this.m_parts)
                 {
                     foreach (SceneObjectPart part in this.m_parts.Values)
                     {
-                        part.GroupPosition = value;
+                        part.GroupPosition = val;
                     }
                 }
                 if (m_rootPart.PhysActor != null)