ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-08 18:25:33 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into careminster

Browse Source
This commit is contained in:
Melanie
2013-04-25 20:47:55 +01:00
parent c7a0ce0865 3bc8017464
commit c6628b1c76
4 changed files with 406 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
OpenSim/Region/CoreModules/Avatar/Gods/GodsModule.cs
View File

@@ -288,8 +288,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)