From c83dd021f300a4272c8a869d20087dac29992c6d Mon Sep 17 00:00:00 2001
From: UbitUmarov
Date: Fri, 7 Sep 2012 11:37:51 +0100
Subject:  stop sending duplicated parcelProprieties at login

---
 .../CoreModules/World/Land/LandManagementModule.cs | 57 +++++++++++++++-------
 1 file changed, 39 insertions(+), 18 deletions(-)

(limited to 'OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs')

diff --git a/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs b/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs
index 8bc81ae..aae6603 100644
--- a/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs
+++ b/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs
@@ -401,30 +401,51 @@ namespace OpenSim.Region.CoreModules.World.Land
 
         public void SendLandUpdate(ScenePresence avatar, bool force)
         {
+
+            /* stop sendind same data twice
+                        ILandObject over = GetLandObject((int)Math.Min(((int)Constants.RegionSize - 1), Math.Max(0, Math.Round(avatar.AbsolutePosition.X))),
+                                                         (int)Math.Min(((int)Constants.RegionSize - 1), Math.Max(0, Math.Round(avatar.AbsolutePosition.Y))));
+
+                        if (over != null)
+                        {
+
+                            if (force)
+                            {
+                                if (!avatar.IsChildAgent)
+                                {
+                                    over.SendLandUpdateToClient(avatar.ControllingClient);
+                                    m_scene.EventManager.TriggerAvatarEnteringNewParcel(avatar, over.LandData.LocalID,
+                                                                                        m_scene.RegionInfo.RegionID);
+                                }
+                            }
+
+                            if (avatar.currentParcelUUID != over.LandData.GlobalID)
+                            {
+                                if (!avatar.IsChildAgent)
+                                {
+                                    over.SendLandUpdateToClient(avatar.ControllingClient);
+                                    avatar.currentParcelUUID = over.LandData.GlobalID;
+                                    m_scene.EventManager.TriggerAvatarEnteringNewParcel(avatar, over.LandData.LocalID,
+                                                                                        m_scene.RegionInfo.RegionID);
+                                }
+                            }
+             */
+            if (avatar.IsChildAgent)
+                return;
+
             ILandObject over = GetLandObject((int)Math.Min(((int)Constants.RegionSize - 1), Math.Max(0, Math.Round(avatar.AbsolutePosition.X))),
-                                             (int)Math.Min(((int)Constants.RegionSize - 1), Math.Max(0, Math.Round(avatar.AbsolutePosition.Y))));
+                                                         (int)Math.Min(((int)Constants.RegionSize - 1), Math.Max(0, Math.Round(avatar.AbsolutePosition.Y))));
 
             if (over != null)
             {
-                if (force)
+                bool NotsameID = (avatar.currentParcelUUID != over.LandData.GlobalID);
+                if (force || NotsameID)
                 {
-                    if (!avatar.IsChildAgent)
-                    {
-                        over.SendLandUpdateToClient(avatar.ControllingClient);
-                        m_scene.EventManager.TriggerAvatarEnteringNewParcel(avatar, over.LandData.LocalID,
-                                                                            m_scene.RegionInfo.RegionID);
-                    }
-                }
-
-                if (avatar.currentParcelUUID != over.LandData.GlobalID)
-                {
-                    if (!avatar.IsChildAgent)
-                    {
-                        over.SendLandUpdateToClient(avatar.ControllingClient);
+                    over.SendLandUpdateToClient(avatar.ControllingClient);
+                    if (NotsameID)
                         avatar.currentParcelUUID = over.LandData.GlobalID;
-                        m_scene.EventManager.TriggerAvatarEnteringNewParcel(avatar, over.LandData.LocalID,
-                                                                            m_scene.RegionInfo.RegionID);
-                    }
+                    m_scene.EventManager.TriggerAvatarEnteringNewParcel(avatar, over.LandData.LocalID,
+                                                                        m_scene.RegionInfo.RegionID);
                 }
             }
         }
-- 
cgit v1.1