From bad01fbb418e8df5caa2735bf62ec41f8b378f10 Mon Sep 17 00:00:00 2001
From: UbitUmarov
Date: Sun, 3 Aug 2014 22:57:08 +0100
Subject: some mess cleanup

---
 OpenSim/Region/Framework/Scenes/ScenePresence.cs | 75 +++++++++++-------------
 1 file changed, 35 insertions(+), 40 deletions(-)

diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index 03eac77..8d254f2 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -1836,12 +1836,12 @@ namespace OpenSim.Region.Framework.Scenes
                 m_currentParcelUUID = UUID.Zero;
 
                 // send initial land overlay and parcel 
-                if (!IsChildAgent)
+                ILandChannel landch = m_scene.LandChannel;
+                if (landch != null)
                 {
-                    ILandChannel landch = m_scene.LandChannel;
-                    if (landch != null)
+                    landch.sendClientInitialLandInfo(client);
+                    if (!IsChildAgent)
                     {
-                        landch.sendClientInitialLandInfo(client);
                         newhide = m_currentParcelHide;
                         m_currentParcelHide = false;
                     }
@@ -5416,15 +5416,14 @@ namespace OpenSim.Region.Framework.Scenes
                 {
                     foreach (ScenePresence p in viewsToSendme)
                     {
+                        if (p.IsChildAgent)
+                            continue;
                         m_log.Debug("[AVATAR]: viewMe: " + Lastname + " " + p.Lastname);
-                        if (!p.IsChildAgent)
-                        {
-                            ControllingClient.SendAvatarDataImmediate(p);
-                            p.SendAppearanceToAgent(this);
-                            p.SendAttachmentsToClient(ControllingClient);
-                            if (p.Animator != null)
-                                p.Animator.SendAnimPackToClient(ControllingClient);
-                        }
+                        ControllingClient.SendAvatarDataImmediate(p);
+                        p.SendAppearanceToAgent(this);
+                        p.SendAttachmentsToClient(ControllingClient);
+                        if (p.Animator != null)
+                            p.Animator.SendAnimPackToClient(ControllingClient);
                     }
                 }
             }
@@ -5526,14 +5525,13 @@ namespace OpenSim.Region.Framework.Scenes
                 foreach (ScenePresence p in viewsToSendme)
                 {
                     m_log.Debug("[AVATAR]: viewMe: " + Lastname + "<-" + p.Lastname);
-                    if (!p.IsChildAgent)
-                    {
-                        ControllingClient.SendAvatarDataImmediate(p);
-                        p.SendAppearanceToAgent(this);
-                        p.SendAttachmentsToClient(ControllingClient);
-                        if (p.Animator != null)
-                            p.Animator.SendAnimPackToClient(ControllingClient);
-                    }
+                    if (p.IsChildAgent)
+                        continue;
+                    ControllingClient.SendAvatarDataImmediate(p);
+                    p.SendAppearanceToAgent(this);
+                    p.SendAttachmentsToClient(ControllingClient);
+                    if (p.Animator != null)
+                        p.Animator.SendAnimPackToClient(ControllingClient);
                 }
             }
         }
@@ -5548,7 +5546,6 @@ namespace OpenSim.Region.Framework.Scenes
 
             if (abort)
             {
-
                 List<ScenePresence> viewsToSendme = new List<ScenePresence>();
 
                 foreach (ScenePresence p in allpresences)
@@ -5566,15 +5563,14 @@ namespace OpenSim.Region.Framework.Scenes
                 {
                     foreach (ScenePresence p in viewsToSendme)
                     {
-                        m_log.Debug("[AVATAR]: viewMe: " + Lastname + "<-" + p.Lastname);
-                        if (!p.IsChildAgent)
-                        {
-                            ControllingClient.SendAvatarDataImmediate(p);
-                            p.SendAppearanceToAgent(this);
-                            p.SendAttachmentsToClient(ControllingClient);
-                            if (p.Animator != null)
-                                p.Animator.SendAnimPackToClient(ControllingClient);
-                        }
+                        if (p.IsChildAgent)
+                            continue;
+//                        m_log.Debug("[AVATAR]: viewMe: " + Lastname + " " + p.Lastname);
+                        ControllingClient.SendAvatarDataImmediate(p);
+                        p.SendAppearanceToAgent(this);
+                        p.SendAttachmentsToClient(ControllingClient);
+                        if (p.Animator != null)
+                            p.Animator.SendAnimPackToClient(ControllingClient);
                     }
                 }
             }
@@ -5768,8 +5764,8 @@ namespace OpenSim.Region.Framework.Scenes
             {
                 foreach (ScenePresence p in viewsToSendto)
                 {
-                    m_log.Debug("[AVATAR]: viewTo: " + Lastname + " " + p.Lastname);
                     p.ControllingClient.SendAvatarDataImmediate(this);
+//                    m_log.Debug("[AVATAR]: viewTo: " + Lastname + " " + p.Lastname);
                     SendAppearanceToAgent(p);
                     SendAttachmentsToClient(p.ControllingClient);
                     if (Animator != null)
@@ -5781,15 +5777,14 @@ namespace OpenSim.Region.Framework.Scenes
             {
                 foreach (ScenePresence p in viewsToSendme)
                 {
-                    m_log.Debug("[AVATAR]: viewMe: " + Lastname + "<-" + p.Lastname);
-                    if (!p.IsChildAgent)
-                    {
-                        ControllingClient.SendAvatarDataImmediate(p);
-                        p.SendAppearanceToAgent(this);
-                        p.SendAttachmentsToClient(ControllingClient);
-                        if (p.Animator != null)
-                            p.Animator.SendAnimPackToClient(ControllingClient);
-                    }
+                    if (p.IsChildAgent)
+                        continue;
+//                   m_log.Debug("[AVATAR]: viewMe: " + Lastname + "<-" + p.Lastname);
+                    ControllingClient.SendAvatarDataImmediate(p);
+                    p.SendAppearanceToAgent(this);
+                    p.SendAttachmentsToClient(ControllingClient);
+                    if (p.Animator != null)
+                        p.Animator.SendAnimPackToClient(ControllingClient);
                 }
             }
         }
-- 
cgit v1.1