aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorDiva Canto2013-04-24 19:00:41 -0700
committerMelanie2013-04-25 02:48:49 +0100
commit2093d87e20956b9b6bad34668ae230fdafeeaeda (patch)
tree534d24ae1204ce1483c34d4a63327cbb179b7467 /OpenSim
parentAdding the dynamic menu module which allows registering new menu options in c... (diff)
downloadopensim-SC_OLD-2093d87e20956b9b6bad34668ae230fdafeeaeda.zip
opensim-SC_OLD-2093d87e20956b9b6bad34668ae230fdafeeaeda.tar.gz
opensim-SC_OLD-2093d87e20956b9b6bad34668ae230fdafeeaeda.tar.bz2
opensim-SC_OLD-2093d87e20956b9b6bad34668ae230fdafeeaeda.tar.xz
Make the kicked user's avie truly disappear when it's god-kicked.
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Region/CoreModules/Avatar/Gods/GodsModule.cs3
1 files changed, 1 insertions, 2 deletions
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
278 if (sp.IsChildAgent) 278 if (sp.IsChildAgent)
279 return; 279 return;
280 sp.ControllingClient.Kick(reason); 280 sp.ControllingClient.Kick(reason);
281 sp.MakeChildAgent(); 281 sp.Scene.IncomingCloseAgent(sp.UUID, true);
282 sp.ControllingClient.Close();
283 } 282 }
284 283
285 private void OnIncomingInstantMessage(GridInstantMessage msg) 284 private void OnIncomingInstantMessage(GridInstantMessage msg)