diff options
| author | Melanie | 2012-09-16 22:50:35 +0200 |
|---|---|---|
| committer | Melanie | 2012-09-16 22:50:35 +0200 |
| commit | a76ce4f64d6f19e508d8e6f4d12e8f79f6880895 (patch) | |
| tree | 2aa72f8ca88e0121556bf390b73bb04cf7ddc032 /OpenSim/Region/CoreModules/Avatar/Gods | |
| parent | Catch a nullref in the code to suppress GetTexture warnign spam we can't (diff) | |
| download | opensim-SC-a76ce4f64d6f19e508d8e6f4d12e8f79f6880895.zip opensim-SC-a76ce4f64d6f19e508d8e6f4d12e8f79f6880895.tar.gz opensim-SC-a76ce4f64d6f19e508d8e6f4d12e8f79f6880895.tar.bz2 opensim-SC-a76ce4f64d6f19e508d8e6f4d12e8f79f6880895.tar.xz | |
Make the agent being kicked a child agent first so there won't be a ghost
Diffstat (limited to 'OpenSim/Region/CoreModules/Avatar/Gods')
| -rw-r--r-- | OpenSim/Region/CoreModules/Avatar/Gods/GodsModule.cs | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/Gods/GodsModule.cs b/OpenSim/Region/CoreModules/Avatar/Gods/GodsModule.cs index 1492302..716cc69 100644 --- a/OpenSim/Region/CoreModules/Avatar/Gods/GodsModule.cs +++ b/OpenSim/Region/CoreModules/Avatar/Gods/GodsModule.cs | |||
| @@ -256,7 +256,8 @@ namespace OpenSim.Region.CoreModules.Avatar.Gods | |||
| 256 | if (sp.IsChildAgent) | 256 | if (sp.IsChildAgent) |
| 257 | return; | 257 | return; |
| 258 | sp.ControllingClient.Kick(reason); | 258 | sp.ControllingClient.Kick(reason); |
| 259 | sp.Scene.IncomingCloseAgent(sp.UUID); | 259 | sp.MakeChildAgent(); |
| 260 | sp.ControllingClient.Close(); | ||
| 260 | } | 261 | } |
| 261 | 262 | ||
| 262 | private void OnIncomingInstantMessage(GridInstantMessage msg) | 263 | private void OnIncomingInstantMessage(GridInstantMessage msg) |