diff options
author | Justin Clark-Casey (justincc) | 2010-08-18 23:15:25 +0100 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2010-08-18 23:15:25 +0100 |
commit | 8c12f22140d2885bb79aa4e201345ae6fd45fec6 (patch) | |
tree | e6d3fd25eafdee7f790f54d092e8494be4715149 /OpenSim/Region/CoreModules/World | |
parent | Add textures no longer shipped with newer viewers to OpenSim's standard asset... (diff) | |
parent | Prevent a bad cast in llCreateLink(). (diff) | |
download | opensim-SC_OLD-8c12f22140d2885bb79aa4e201345ae6fd45fec6.zip opensim-SC_OLD-8c12f22140d2885bb79aa4e201345ae6fd45fec6.tar.gz opensim-SC_OLD-8c12f22140d2885bb79aa4e201345ae6fd45fec6.tar.bz2 opensim-SC_OLD-8c12f22140d2885bb79aa4e201345ae6fd45fec6.tar.xz |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Region/CoreModules/World')
-rw-r--r-- | OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs b/OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs index 940b535..51f2c41 100644 --- a/OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs +++ b/OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs | |||
@@ -343,7 +343,6 @@ namespace OpenSim.Region.CoreModules.World.Estate | |||
343 | { | 343 | { |
344 | if (!s.IsChildAgent) | 344 | if (!s.IsChildAgent) |
345 | { | 345 | { |
346 | s.ControllingClient.SendTeleportLocationStart(); | ||
347 | m_scene.TeleportClientHome(user, s.ControllingClient); | 346 | m_scene.TeleportClientHome(user, s.ControllingClient); |
348 | } | 347 | } |
349 | } | 348 | } |
@@ -478,7 +477,6 @@ namespace OpenSim.Region.CoreModules.World.Estate | |||
478 | ScenePresence s = m_scene.GetScenePresence(prey); | 477 | ScenePresence s = m_scene.GetScenePresence(prey); |
479 | if (s != null) | 478 | if (s != null) |
480 | { | 479 | { |
481 | s.ControllingClient.SendTeleportLocationStart(); | ||
482 | m_scene.TeleportClientHome(prey, s.ControllingClient); | 480 | m_scene.TeleportClientHome(prey, s.ControllingClient); |
483 | } | 481 | } |
484 | } | 482 | } |
@@ -498,7 +496,6 @@ namespace OpenSim.Region.CoreModules.World.Estate | |||
498 | // Also make sure they are actually in the region | 496 | // Also make sure they are actually in the region |
499 | if (p != null && !p.IsChildAgent) | 497 | if (p != null && !p.IsChildAgent) |
500 | { | 498 | { |
501 | p.ControllingClient.SendTeleportLocationStart(); | ||
502 | m_scene.TeleportClientHome(p.UUID, p.ControllingClient); | 499 | m_scene.TeleportClientHome(p.UUID, p.ControllingClient); |
503 | } | 500 | } |
504 | } | 501 | } |