diff options
| author | Justin Clark-Casey (justincc) | 2013-08-09 17:52:29 +0100 |
|---|---|---|
| committer | Justin Clark-Casey (justincc) | 2013-08-09 17:52:29 +0100 |
| commit | 97bcb59bee8a744c967b85f5feee263793161325 (patch) | |
| tree | 67ec4306424df40c53fe6942bf02af680da21cea /OpenSim/Region/CoreModules/World | |
| parent | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff) | |
| parent | Comment back out seed dump code enabled in b1c26a56. Also adds a few telepor... (diff) | |
| download | opensim-SC_OLD-97bcb59bee8a744c967b85f5feee263793161325.zip opensim-SC_OLD-97bcb59bee8a744c967b85f5feee263793161325.tar.gz opensim-SC_OLD-97bcb59bee8a744c967b85f5feee263793161325.tar.bz2 opensim-SC_OLD-97bcb59bee8a744c967b85f5feee263793161325.tar.xz | |
Merge branch 'TeleportWork'
Diffstat (limited to 'OpenSim/Region/CoreModules/World')
| -rw-r--r-- | OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs b/OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs index 121b2aa..31547a6 100644 --- a/OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs +++ b/OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs | |||
| @@ -562,7 +562,7 @@ namespace OpenSim.Region.CoreModules.World.Estate | |||
| 562 | if (!Scene.TeleportClientHome(user, s.ControllingClient)) | 562 | if (!Scene.TeleportClientHome(user, s.ControllingClient)) |
| 563 | { | 563 | { |
| 564 | s.ControllingClient.Kick("Your access to the region was revoked and TP home failed - you have been logged out."); | 564 | s.ControllingClient.Kick("Your access to the region was revoked and TP home failed - you have been logged out."); |
| 565 | s.ControllingClient.Close(); | 565 | Scene.IncomingCloseAgent(s.UUID, false); |
| 566 | } | 566 | } |
| 567 | } | 567 | } |
| 568 | } | 568 | } |
| @@ -797,7 +797,7 @@ namespace OpenSim.Region.CoreModules.World.Estate | |||
| 797 | if (!Scene.TeleportClientHome(prey, s.ControllingClient)) | 797 | if (!Scene.TeleportClientHome(prey, s.ControllingClient)) |
| 798 | { | 798 | { |
| 799 | s.ControllingClient.Kick("You were teleported home by the region owner, but the TP failed - you have been logged out."); | 799 | s.ControllingClient.Kick("You were teleported home by the region owner, but the TP failed - you have been logged out."); |
| 800 | s.ControllingClient.Close(); | 800 | Scene.IncomingCloseAgent(s.UUID, false); |
| 801 | } | 801 | } |
| 802 | } | 802 | } |
| 803 | } | 803 | } |
| @@ -820,7 +820,7 @@ namespace OpenSim.Region.CoreModules.World.Estate | |||
| 820 | if (!Scene.TeleportClientHome(p.UUID, p.ControllingClient)) | 820 | if (!Scene.TeleportClientHome(p.UUID, p.ControllingClient)) |
| 821 | { | 821 | { |
| 822 | p.ControllingClient.Kick("You were teleported home by the region owner, but the TP failed - you have been logged out."); | 822 | p.ControllingClient.Kick("You were teleported home by the region owner, but the TP failed - you have been logged out."); |
| 823 | p.ControllingClient.Close(); | 823 | Scene.IncomingCloseAgent(p.UUID, false); |
| 824 | } | 824 | } |
| 825 | } | 825 | } |
| 826 | } | 826 | } |