diff options
| author | Melanie | 2012-09-27 17:29:44 +0100 |
|---|---|---|
| committer | Melanie | 2012-09-27 17:29:44 +0100 |
| commit | 001ec0e2e6f8c426af8f4a1c1eb9be4db066aea4 (patch) | |
| tree | 11170fddbd0f4c71c6f8288b5848442dfdc90d76 /OpenSim/Region/CoreModules/Avatar | |
| parent | Remove a core undo call that we don't need. (diff) | |
| parent | Merge branch 'ubitwork' into avination (diff) | |
| download | opensim-SC-001ec0e2e6f8c426af8f4a1c1eb9be4db066aea4.zip opensim-SC-001ec0e2e6f8c426af8f4a1c1eb9be4db066aea4.tar.gz opensim-SC-001ec0e2e6f8c426af8f4a1c1eb9be4db066aea4.tar.bz2 opensim-SC-001ec0e2e6f8c426af8f4a1c1eb9be4db066aea4.tar.xz | |
Merge branch 'avination' into careminster
Conflicts:
OpenSim/Region/CoreModules/Agent/AssetTransaction/AgentAssetsTransactions.cs
OpenSim/Region/Framework/Scenes/Scene.cs
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) |