aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
-rw-r--r--OpenSim/Region/Environment/Scenes/Hypergrid/HGSceneCommunicationService.cs3
-rw-r--r--OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs7
2 files changed, 7 insertions, 3 deletions
diff --git a/OpenSim/Region/Environment/Scenes/Hypergrid/HGSceneCommunicationService.cs b/OpenSim/Region/Environment/Scenes/Hypergrid/HGSceneCommunicationService.cs
index 0ee0869..3bc7fd1 100644
--- a/OpenSim/Region/Environment/Scenes/Hypergrid/HGSceneCommunicationService.cs
+++ b/OpenSim/Region/Environment/Scenes/Hypergrid/HGSceneCommunicationService.cs
@@ -251,7 +251,7 @@ namespace OpenSim.Region.Environment.Scenes.Hypergrid
251 // return; 251 // return;
252 //} 252 //}
253 253
254 Thread.Sleep(2000); 254 Thread.Sleep(5000);
255 255
256 m_log.DebugFormat( 256 m_log.DebugFormat(
257 "[CAPS]: Sending new CAPS seed url {0} to client {1}", agent.CapsPath, avatar.UUID); 257 "[CAPS]: Sending new CAPS seed url {0} to client {1}", agent.CapsPath, avatar.UUID);
@@ -293,6 +293,7 @@ namespace OpenSim.Region.Environment.Scenes.Hypergrid
293 /// 293 ///
294 if (Util.IsOutsideView(oldRegionX, newRegionX, oldRegionY, newRegionY) || isHyperLink) 294 if (Util.IsOutsideView(oldRegionX, newRegionX, oldRegionY, newRegionY) || isHyperLink)
295 { 295 {
296 Thread.Sleep(2000);
296 CloseConnection(avatar.UUID); 297 CloseConnection(avatar.UUID);
297 } 298 }
298 // if (teleport success) // seems to be always success here 299 // if (teleport success) // seems to be always success here
diff --git a/OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs b/OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs
index 2bfb7d6..bce87b7 100644
--- a/OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs
+++ b/OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs
@@ -821,7 +821,9 @@ namespace OpenSim.Region.Environment.Scenes
821 + "/CAPS/" + agent.CapsPath + "0000/"; 821 + "/CAPS/" + agent.CapsPath + "0000/";
822 } 822 }
823 823
824 824 // Expect avatar crossing is a heavy-duty function at the destination.
825 // That is where MakeRoot is called, which fetches appearance and inventory.
826 // Plus triggers OnMakeRoot, which spawns a series of asynchronous updates.
825 m_commsProvider.InterRegion.ExpectAvatarCrossing(reg.RegionHandle, avatar.ControllingClient.AgentId, 827 m_commsProvider.InterRegion.ExpectAvatarCrossing(reg.RegionHandle, avatar.ControllingClient.AgentId,
826 position, false); 828 position, false);
827 //{ 829 //{
@@ -833,7 +835,7 @@ namespace OpenSim.Region.Environment.Scenes
833 // return; 835 // return;
834 //} 836 //}
835 837
836 Thread.Sleep(2000); 838 Thread.Sleep(5000);
837 839
838 m_log.DebugFormat( 840 m_log.DebugFormat(
839 "[CAPS]: Sending new CAPS seed url {0} to client {1}", capsPath, avatar.UUID); 841 "[CAPS]: Sending new CAPS seed url {0} to client {1}", capsPath, avatar.UUID);
@@ -864,6 +866,7 @@ namespace OpenSim.Region.Environment.Scenes
864 866
865 if (Util.IsOutsideView(oldRegionX, newRegionX, oldRegionY, newRegionY)) 867 if (Util.IsOutsideView(oldRegionX, newRegionX, oldRegionY, newRegionY))
866 { 868 {
869 Thread.Sleep(2000);
867 CloseConnection(avatar.UUID); 870 CloseConnection(avatar.UUID);
868 } 871 }
869 872