aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region
diff options
context:
space:
mode:
authorDiva Canto2013-04-24 19:00:41 -0700
committerDiva Canto2013-04-24 19:00:41 -0700
commit0e22021c650a84ae1b9ed86d7c8df3beeb6e54ed (patch)
tree357bf93e00527272c796f69ca2e88900b8f1c5c7 /OpenSim/Region
parentAdding the dynamic menu module which allows registering new menu options in c... (diff)
downloadopensim-SC_OLD-0e22021c650a84ae1b9ed86d7c8df3beeb6e54ed.zip
opensim-SC_OLD-0e22021c650a84ae1b9ed86d7c8df3beeb6e54ed.tar.gz
opensim-SC_OLD-0e22021c650a84ae1b9ed86d7c8df3beeb6e54ed.tar.bz2
opensim-SC_OLD-0e22021c650a84ae1b9ed86d7c8df3beeb6e54ed.tar.xz
Make the kicked user's avie truly disappear when it's god-kicked.
Diffstat (limited to 'OpenSim/Region')
-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 d9badcd..16673ec 100644
--- a/OpenSim/Region/CoreModules/Avatar/Gods/GodsModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Gods/GodsModule.cs
@@ -276,8 +276,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Gods
276 if (sp.IsChildAgent) 276 if (sp.IsChildAgent)
277 return; 277 return;
278 sp.ControllingClient.Kick(reason); 278 sp.ControllingClient.Kick(reason);
279 sp.MakeChildAgent(); 279 sp.Scene.IncomingCloseAgent(sp.UUID, true);
280 sp.ControllingClient.Close();
281 } 280 }
282 281
283 private void OnIncomingInstantMessage(GridInstantMessage msg) 282 private void OnIncomingInstantMessage(GridInstantMessage msg)