diff options
author | Justin Clarke Casey | 2008-11-07 16:54:57 +0000 |
---|---|---|
committer | Justin Clarke Casey | 2008-11-07 16:54:57 +0000 |
commit | 2184f4b2a949354d0b7724fb5d274b36d9418c52 (patch) | |
tree | b22d3c6e926fd424d6b46627948e906b495b39c6 /OpenSim/Region/Environment/Modules/World/Estate/EstateManagementModule.cs | |
parent | adding region_port field to /admin/rest/regions/UUID/ to convey the (diff) | |
download | opensim-SC_OLD-2184f4b2a949354d0b7724fb5d274b36d9418c52.zip opensim-SC_OLD-2184f4b2a949354d0b7724fb5d274b36d9418c52.tar.gz opensim-SC_OLD-2184f4b2a949354d0b7724fb5d274b36d9418c52.tar.bz2 opensim-SC_OLD-2184f4b2a949354d0b7724fb5d274b36d9418c52.tar.xz |
* Apply patch in http://opensimulator.org/mantis/view.php?id=2397
* Fix from 7139 also needed in the Estate Menu teleport home functions
* Thanks idb
Diffstat (limited to 'OpenSim/Region/Environment/Modules/World/Estate/EstateManagementModule.cs')
-rw-r--r-- | OpenSim/Region/Environment/Modules/World/Estate/EstateManagementModule.cs | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/OpenSim/Region/Environment/Modules/World/Estate/EstateManagementModule.cs b/OpenSim/Region/Environment/Modules/World/Estate/EstateManagementModule.cs index a888235..041bba5 100644 --- a/OpenSim/Region/Environment/Modules/World/Estate/EstateManagementModule.cs +++ b/OpenSim/Region/Environment/Modules/World/Estate/EstateManagementModule.cs | |||
@@ -263,7 +263,10 @@ namespace OpenSim.Region.Environment.Modules.World.Estate | |||
263 | if (s != null) | 263 | if (s != null) |
264 | { | 264 | { |
265 | if (!s.IsChildAgent) | 265 | if (!s.IsChildAgent) |
266 | { | ||
267 | s.ControllingClient.SendTeleportLocationStart(); | ||
266 | m_scene.TeleportClientHome(user, s.ControllingClient); | 268 | m_scene.TeleportClientHome(user, s.ControllingClient); |
269 | } | ||
267 | } | 270 | } |
268 | 271 | ||
269 | } | 272 | } |
@@ -389,6 +392,7 @@ namespace OpenSim.Region.Environment.Modules.World.Estate | |||
389 | ScenePresence s = m_scene.GetScenePresence(prey); | 392 | ScenePresence s = m_scene.GetScenePresence(prey); |
390 | if (s != null) | 393 | if (s != null) |
391 | { | 394 | { |
395 | s.ControllingClient.SendTeleportLocationStart(); | ||
392 | m_scene.TeleportClientHome(prey, s.ControllingClient); | 396 | m_scene.TeleportClientHome(prey, s.ControllingClient); |
393 | } | 397 | } |
394 | } | 398 | } |
@@ -409,6 +413,7 @@ namespace OpenSim.Region.Environment.Modules.World.Estate | |||
409 | // Also make sure they are actually in the region | 413 | // Also make sure they are actually in the region |
410 | if (!s.IsChildAgent) | 414 | if (!s.IsChildAgent) |
411 | { | 415 | { |
416 | s.ControllingClient.SendTeleportLocationStart(); | ||
412 | m_scene.TeleportClientHome(s.UUID, s.ControllingClient); | 417 | m_scene.TeleportClientHome(s.UUID, s.ControllingClient); |
413 | } | 418 | } |
414 | } | 419 | } |