From 7a619ad84aaccbe511d6b4415f1ccc177f1217b9 Mon Sep 17 00:00:00 2001
From: diva
Date: Sat, 20 Dec 2008 02:45:12 +0000
Subject: Slowing things down a little bit in TPs, with a couple of extra
 Thread.Sleep to give enough time for the destination to set up CAPs for the
 incoming agent before sending EAC to the client.

---
 .../Environment/Scenes/Hypergrid/HGSceneCommunicationService.cs     | 6 +++++-
 OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs      | 6 +++++-
 2 files changed, 10 insertions(+), 2 deletions(-)

(limited to 'OpenSim')

diff --git a/OpenSim/Region/Environment/Scenes/Hypergrid/HGSceneCommunicationService.cs b/OpenSim/Region/Environment/Scenes/Hypergrid/HGSceneCommunicationService.cs
index 1b3f008..d4f66c7 100644
--- a/OpenSim/Region/Environment/Scenes/Hypergrid/HGSceneCommunicationService.cs
+++ b/OpenSim/Region/Environment/Scenes/Hypergrid/HGSceneCommunicationService.cs
@@ -187,6 +187,8 @@ namespace OpenSim.Region.Environment.Scenes.Hypergrid
                         agent.child = true;
                         if (Util.IsOutsideView(oldRegionX, newRegionX, oldRegionY, newRegionY) || isHyperLink)
                         {
+                            Thread.Sleep(1000);
+
                             // brand new agent
                             agent.CapsPath = Util.GetRandomCapsPath();
                             if (!m_commsProvider.InterRegion.InformRegionOfChildAgent(reg.RegionHandle, agent))
@@ -195,6 +197,8 @@ namespace OpenSim.Region.Environment.Scenes.Hypergrid
                                 return;
                             }
 
+                            Thread.Sleep(2000);
+
                             // TODO Should construct this behind a method
                             capsPath =
                                 "http://" + reg.ExternalHostName + ":" + reg.HttpPort
@@ -262,7 +266,7 @@ namespace OpenSim.Region.Environment.Scenes.Hypergrid
                         /// 
 
                         avatar.MakeChildAgent();
-                        Thread.Sleep(5000);
+                        Thread.Sleep(3000);
                         avatar.CrossAttachmentsIntoNewRegion(reg.RegionHandle, true);
                         if (KiPrimitive != null)
                         {
diff --git a/OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs b/OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs
index ca6778a..1d50865 100644
--- a/OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs
+++ b/OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs
@@ -772,6 +772,8 @@ namespace OpenSim.Region.Environment.Scenes
                         agent.child = true;
                         if (Util.IsOutsideView(oldRegionX, newRegionX, oldRegionY, newRegionY))
                         {
+                            Thread.Sleep(1000);
+
                             // brand new agent
                             agent.CapsPath = Util.GetRandomCapsPath();
                             if (!m_commsProvider.InterRegion.InformRegionOfChildAgent(reg.RegionHandle, agent))
@@ -780,6 +782,8 @@ namespace OpenSim.Region.Environment.Scenes
                                 return;
                             }
 
+                            Thread.Sleep(2000);
+
                             // TODO Should construct this behind a method
                             capsPath =
                                 "http://" + reg.ExternalHostName + ":" + reg.HttpPort
@@ -836,7 +840,7 @@ namespace OpenSim.Region.Environment.Scenes
                         }
 
                         avatar.MakeChildAgent();
-                        Thread.Sleep(5000);
+                        Thread.Sleep(3000);
                         avatar.CrossAttachmentsIntoNewRegion(reg.RegionHandle, true);
                         if (KiPrimitive != null)
                         {
-- 
cgit v1.1