aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs
diff options
context:
space:
mode:
authorDiva Canto2010-08-16 11:33:59 -0700
committerDiva Canto2010-08-16 11:33:59 -0700
commit77de28965ae5fc6de3c60a28ce7d4e59643a2a70 (patch)
tree61259b696fb8d8a47f10cb83a72d1df145953b8f /OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs
parentIncreased the timeout on AgentUpdate to 30 sec and improved error message to ... (diff)
downloadopensim-SC_OLD-77de28965ae5fc6de3c60a28ce7d4e59643a2a70.zip
opensim-SC_OLD-77de28965ae5fc6de3c60a28ce7d4e59643a2a70.tar.gz
opensim-SC_OLD-77de28965ae5fc6de3c60a28ce7d4e59643a2a70.tar.bz2
opensim-SC_OLD-77de28965ae5fc6de3c60a28ce7d4e59643a2a70.tar.xz
Work on TeleportStart: renamed method from TeleportLocationStart to TeleportStart, and now sending this upon all teleports, not just some, and in the right place (EntityTransferModule).
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs3
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 }