diff options
| author | Melanie | 2012-06-08 00:43:39 +0100 |
|---|---|---|
| committer | Melanie | 2012-06-08 00:43:39 +0100 |
| commit | 48add77a4c985858794c2c3a9d7ea63a31921528 (patch) | |
| tree | 7757e425e3d9e93d742c51e3f39bee57be04546b /OpenSim/Region/Application/OpenSim.cs | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | Go back to calling IncomingCloseAgent() in the "kick user" command for consis... (diff) | |
| download | opensim-SC_OLD-48add77a4c985858794c2c3a9d7ea63a31921528.zip opensim-SC_OLD-48add77a4c985858794c2c3a9d7ea63a31921528.tar.gz opensim-SC_OLD-48add77a4c985858794c2c3a9d7ea63a31921528.tar.bz2 opensim-SC_OLD-48add77a4c985858794c2c3a9d7ea63a31921528.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/Framework/Scenes/Scene.cs
Diffstat (limited to 'OpenSim/Region/Application/OpenSim.cs')
| -rw-r--r-- | OpenSim/Region/Application/OpenSim.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/Application/OpenSim.cs b/OpenSim/Region/Application/OpenSim.cs index 220b9c8..591259b 100644 --- a/OpenSim/Region/Application/OpenSim.cs +++ b/OpenSim/Region/Application/OpenSim.cs | |||
| @@ -486,7 +486,7 @@ namespace OpenSim | |||
| 486 | else | 486 | else |
| 487 | presence.ControllingClient.Kick("\nYou have been logged out by an administrator.\n"); | 487 | presence.ControllingClient.Kick("\nYou have been logged out by an administrator.\n"); |
| 488 | 488 | ||
| 489 | presence.ControllingClient.Close(); | 489 | presence.Scene.IncomingCloseAgent(presence.UUID); |
| 490 | } | 490 | } |
| 491 | } | 491 | } |
| 492 | 492 | ||