diff options
| author | Melanie | 2013-04-25 20:47:55 +0100 |
|---|---|---|
| committer | Melanie | 2013-04-25 20:47:55 +0100 |
| commit | c6628b1c769f957d4ac6c0aa71b2e671a34d5ed8 (patch) | |
| tree | 7d7326fa9f7b894e5d6f846d477d97693644dc07 /OpenSim/Region/CoreModules/Avatar | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | Recover a lost "virtual". Downstream projects need this. (diff) | |
| download | opensim-SC-c6628b1c769f957d4ac6c0aa71b2e671a34d5ed8.zip opensim-SC-c6628b1c769f957d4ac6c0aa71b2e671a34d5ed8.tar.gz opensim-SC-c6628b1c769f957d4ac6c0aa71b2e671a34d5ed8.tar.bz2 opensim-SC-c6628b1c769f957d4ac6c0aa71b2e671a34d5ed8.tar.xz | |
Merge branch 'master' into careminster
Diffstat (limited to 'OpenSim/Region/CoreModules/Avatar')
| -rw-r--r-- | OpenSim/Region/CoreModules/Avatar/Gods/GodsModule.cs | 3 |
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 9fa9be1..89a4d30 100644 --- a/OpenSim/Region/CoreModules/Avatar/Gods/GodsModule.cs +++ b/OpenSim/Region/CoreModules/Avatar/Gods/GodsModule.cs | |||
| @@ -288,8 +288,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Gods | |||
| 288 | if (sp.IsChildAgent) | 288 | if (sp.IsChildAgent) |
| 289 | return; | 289 | return; |
| 290 | sp.ControllingClient.Kick(reason); | 290 | sp.ControllingClient.Kick(reason); |
| 291 | sp.MakeChildAgent(); | 291 | sp.Scene.IncomingCloseAgent(sp.UUID, true); |
| 292 | sp.ControllingClient.Close(); | ||
| 293 | } | 292 | } |
| 294 | 293 | ||
| 295 | private void OnIncomingInstantMessage(GridInstantMessage msg) | 294 | private void OnIncomingInstantMessage(GridInstantMessage msg) |