1 files changed, 42 insertions, 22 deletions

diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index 715a9b6..d4af9fc 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -1057,30 +1057,32 @@ namespace OpenSim.Region.Framework.Scenes
 
             m_scene.EventManager.TriggerSetRootAgentScene(m_uuid, m_scene);
 
-            UUID groupUUID = UUID.Zero;
-            string GroupName = string.Empty;
+            UUID groupUUID = ControllingClient.ActiveGroupId;
+            string groupName = string.Empty;
             ulong groupPowers = 0;
 
             // ----------------------------------
             // Previous Agent Difference - AGNI sends an unsolicited AgentDataUpdate upon root agent status
             try
             {
-                if (gm != null)
+                if (groupUUID != UUID.Zero && gm != null)
                 {
-                    groupUUID = ControllingClient.ActiveGroupId;
                     GroupRecord record = gm.GetGroupRecord(groupUUID);
                     if (record != null)
-                        GroupName = record.GroupName;
+                        groupName = record.GroupName;
+
                     GroupMembershipData groupMembershipData = gm.GetMembershipData(groupUUID, m_uuid);
+
                     if (groupMembershipData != null)
                         groupPowers = groupMembershipData.GroupPowers;
                 }
-                ControllingClient.SendAgentDataUpdate(m_uuid, groupUUID, Firstname, Lastname, groupPowers, GroupName,
-                                                      Grouptitle);
+
+                ControllingClient.SendAgentDataUpdate(
+                    m_uuid, groupUUID, Firstname, Lastname, groupPowers, groupName, Grouptitle);
             }
             catch (Exception e)
             {
-                m_log.Debug("[AGENTUPDATE]: " + e.ToString());
+                m_log.Error("[AGENTUPDATE]: Error ", e);
             }
             // ------------------------------------
 
@@ -3471,8 +3473,6 @@ namespace OpenSim.Region.Framework.Scenes
                 Vector3 pos2 = AbsolutePosition;
                 Vector3 origPosition = pos2;
                 Vector3 vel = Velocity;
-                int neighbor = 0;
-                int[] fix = new int[2];
 
                 // Compute the avatar position in the next physics tick.
                 // If the avatar will be crossing, we force the crossing to happen now
@@ -3505,23 +3505,13 @@ namespace OpenSim.Region.Framework.Scenes
                             if (m_requestedSitTargetUUID == UUID.Zero)
                             {
                                 m_log.DebugFormat("{0} CheckForBorderCrossing: Crossing failed. Restoring old position.", LogHeader);
-                                const float borderFudge = 0.1f;
-
-                                if (origPosition.X < 0)
-                                    origPosition.X = borderFudge;
-                                else if (origPosition.X > (float)m_scene.RegionInfo.RegionSizeX)
-                                    origPosition.X = (float)m_scene.RegionInfo.RegionSizeX - borderFudge;
-                                if (origPosition.Y < 0)
-                                    origPosition.Y = borderFudge;
-                                else if (origPosition.Y > (float)m_scene.RegionInfo.RegionSizeY)
-                                    origPosition.Y = (float)m_scene.RegionInfo.RegionSizeY - borderFudge;
+
                                 Velocity = Vector3.Zero;
-                                AbsolutePosition = origPosition;
+                                AbsolutePosition = EnforceSanityOnPosition(origPosition);
 
                                 AddToPhysicalScene(isFlying);
                             }
                         }
-                             
                     }
                 }
                 else
@@ -3539,6 +3529,36 @@ namespace OpenSim.Region.Framework.Scenes
             }   
         }
 
+        // Given a position, make sure it is within the current region.
+        // If just outside some border, the returned position will be just inside the border on that side.
+        private Vector3 EnforceSanityOnPosition(Vector3 origPosition)
+        {
+            const float borderFudge = 0.1f;
+            Vector3 ret = origPosition;
+
+            // Sanity checking on the position to make sure it is in the region we couldn't cross from
+            float extentX = (float)m_scene.RegionInfo.RegionSizeX;
+            float extentY = (float)m_scene.RegionInfo.RegionSizeY;
+            IRegionCombinerModule combiner = m_scene.RequestModuleInterface<IRegionCombinerModule>();
+            if (combiner != null)
+            {
+                // If a mega-region, the size could be much bigger
+                Vector2 megaExtent = combiner.GetSizeOfMegaregion(m_scene.RegionInfo.RegionID);
+                extentX = megaExtent.X;
+                extentY = megaExtent.Y;
+            }
+            if (ret.X < 0)
+                ret.X = borderFudge;
+            else if (ret.X >= extentX)
+                ret.X = extentX - borderFudge;
+            if (ret.Y < 0)
+                ret.Y = borderFudge;
+            else if (ret.Y >= extentY)
+                ret.Y = extentY - borderFudge;
+
+            return ret;
+        }
+
         /// <summary>
         /// Moves the agent outside the region bounds
         /// Tells neighbor region that we're crossing to it