From d2f3a19838f10363c77aaa537400a64d1b39a45e Mon Sep 17 00:00:00 2001
From: UbitUmarov <ajlduarte@sapo.pt>
Date: Thu, 21 Aug 2014 05:00:51 +0100
Subject: [PATCH] test

---
 OpenSim/Region/Framework/Scenes/ScenePresence.cs | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index ebdf52feac..ac77e2a278 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -5716,7 +5716,7 @@ namespace OpenSim.Region.Framework.Scenes
         private void ParcelLoginCheck(UUID currentParcelID)
         {
             List<ScenePresence> killsToSendto = new List<ScenePresence>();
-            List<uint> killsToSendme = new List<uint>();
+            List<ScenePresence> killsToSendme = new List<ScenePresence>();
             List<ScenePresence> viewsToSendto = new List<ScenePresence>();
             List<ScenePresence> viewsToSendme = new List<ScenePresence>();
             List<ScenePresence> allpresences = null;
@@ -5750,19 +5750,19 @@ namespace OpenSim.Region.Framework.Scenes
                 foreach (ScenePresence p in killsToSendto)
                 {
                     m_log.Debug("[AVATAR]: killTo: " + Lastname + " " + p.Lastname);
-                    try { p.ControllingClient.SendKillObject(new List<uint> { LocalId }); }
-                    catch (NullReferenceException) { }
+                    SendKillTo(p);
+//                    try { p.ControllingClient.SendKillObject(new List<uint> { LocalId }); }
+//                    catch (NullReferenceException) { }
                 }
             }
 
             if (killsToSendme.Count > 0)
             {
                 m_log.Debug("[AVATAR]: killMe: " + Lastname + " " + killsToSendme.Count.ToString());
-                try
+                foreach (ScenePresence p in killsToSendme)
                 {
-                    ControllingClient.SendKillObject(killsToSendme);
+                    SendKillTo(this);
                 }
-                catch (NullReferenceException) { }
 
             }
 /*