reduce the kills sent, hide attachments kills on origin

2 files changed, 19 insertions, 75 deletions

diff --git a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
index 0208676..ec7dd77 100644
--- a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
@@ -1782,10 +1782,9 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
             // Unlike a teleport, here we do not wait for the destination region to confirm the receipt.
             m_entityTransferStateMachine.UpdateInTransit(agent.UUID, AgentTransferState.CleaningUp);
 
-            AgentHasMovedAway(agent, false);
+            AgentHasMovedAway(agent, true);
 
-            KillEntity(agent.Scene, agent.LocalId);
-//            agent.parcelRegionCross(false);
+            agent.parcelRegionCross();
 
             agent.MakeChildAgent();
 
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index 977ff24..20d0f29 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -5503,8 +5503,8 @@ namespace OpenSim.Region.Framework.Scenes
                 {
                     if (p.GodLevel < 200)
                         killsToSendto.Add(p);
-                    if (GodLevel < 200 && p.ParcelHideThisAvatar)
-                        killsToSendme.Add(p.LocalId);
+//                    if (GodLevel < 200 && p.ParcelHideThisAvatar)
+//                        killsToSendme.Add(p.LocalId);
                 }
                 else
                 {
@@ -5567,89 +5567,34 @@ namespace OpenSim.Region.Framework.Scenes
 */
         }
 
-        public void parcelRegionCross(bool abort)
+        public void parcelRegionCross()
         {
-//            if (!ParcelHideThisAvatar)
-//                return;
+            if (!ParcelHideThisAvatar || GodLevel >= 200)
+                return;
 
             List<ScenePresence> allpresences = null;
             allpresences = m_scene.GetScenePresences();
 
-// abort no longer complet
-            if (abort)
-            {
-                List<ScenePresence> viewsToSendme = new List<ScenePresence>();
-
-                foreach (ScenePresence p in allpresences)
-                {
-                    if (p.IsDeleted || p == this || p.ControllingClient == null || !p.ControllingClient.IsActive)
-                        continue;
-
-                    if (p.currentParcelUUID == m_currentParcelUUID)
-                    {
-                        viewsToSendme.Add(p);
-                    }
-                }
+            List<uint> killsToSendme = new List<uint>();
 
-                if (viewsToSendme.Count > 0)
-                {
-                    foreach (ScenePresence p in viewsToSendme)
-                    {
-                        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);
-                    }
-                }
-            }
-            else
+            foreach (ScenePresence p in allpresences)
             {
+                if (p.IsDeleted || p == this || p.ControllingClient == null || !p.ControllingClient.IsActive)
+                    continue;
 
-                bool inprivate = ParcelHideThisAvatar && GodLevel < 200;
-                List<uint> killsToSendme = new List<uint>();
-
-                if (inprivate)
+                if (p.currentParcelUUID == m_currentParcelUUID)
                 {
-                    foreach (ScenePresence p in allpresences)
-                    {
-                        if (p.IsDeleted || p == this || p.ControllingClient == null || !p.ControllingClient.IsActive)
-                            continue;
-
-                        if (p.currentParcelUUID == m_currentParcelUUID)
-                        {
-                            m_log.Debug("[AVATAR]: killMe: " + Lastname + " " + p.Lastname);
-                            killsToSendme.Add(p.LocalId);
-                        }
-                    }
+                    killsToSendme.Add(p.LocalId);
                 }
-/*
-                else
-                {
-                    foreach (ScenePresence p in allpresences)
-                    {
-                        if (p.IsDeleted || p == this || p.ControllingClient == null || !p.ControllingClient.IsActive)
-                            continue;
+            }
 
-                        killsToSendme.Add(p.LocalId);
-                    }
-                }
-*/
-                if (killsToSendme.Count > 0)
+            if (killsToSendme.Count > 0)
+            {
+                try
                 {
-                    try
-                    {
-                        ControllingClient.SendKillObject(killsToSendme);
-                    }
-                    catch (NullReferenceException) { }
+                    ControllingClient.SendKillObject(killsToSendme);
                 }
-               
-                if (Scene.AttachmentsModule != null)
-                    Scene.AttachmentsModule.DeleteAttachmentsFromScene(this, true);
-
+                catch (NullReferenceException) { }
             }
         }