diff options
| author | ubit | 2012-09-17 14:35:01 +0200 |
|---|---|---|
| committer | ubit | 2012-09-17 14:35:01 +0200 |
| commit | 434704fa99326dbba799d2c6f40d71a0e7402467 (patch) | |
| tree | 2c81caf4d3523d729a2bed63f35e1d96ff2d20d0 /OpenSim/Region/CoreModules/Avatar | |
| parent | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork (diff) | |
| parent | add suport funtions for mesh upload costs (diff) | |
| download | opensim-SC-434704fa99326dbba799d2c6f40d71a0e7402467.zip opensim-SC-434704fa99326dbba799d2c6f40d71a0e7402467.tar.gz opensim-SC-434704fa99326dbba799d2c6f40d71a0e7402467.tar.bz2 opensim-SC-434704fa99326dbba799d2c6f40d71a0e7402467.tar.xz | |
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
Diffstat (limited to 'OpenSim/Region/CoreModules/Avatar')
| -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) |