From 2093d87e20956b9b6bad34668ae230fdafeeaeda Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Wed, 24 Apr 2013 19:00:41 -0700
Subject: Make the kicked user's avie truly disappear when it's god-kicked.

---
 OpenSim/Region/CoreModules/Avatar/Gods/GodsModule.cs | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'OpenSim')

diff --git a/OpenSim/Region/CoreModules/Avatar/Gods/GodsModule.cs b/OpenSim/Region/CoreModules/Avatar/Gods/GodsModule.cs
index d2e71a7..fa8c3f3 100644
--- a/OpenSim/Region/CoreModules/Avatar/Gods/GodsModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Gods/GodsModule.cs
@@ -278,8 +278,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Gods
             if (sp.IsChildAgent)
                 return;
             sp.ControllingClient.Kick(reason);
-            sp.MakeChildAgent();
-            sp.ControllingClient.Close();
+            sp.Scene.IncomingCloseAgent(sp.UUID, true); 
         }
 
         private void OnIncomingInstantMessage(GridInstantMessage msg)
-- 
cgit v1.1