aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authordiva2008-12-20 02:45:12 +0000
committerdiva2008-12-20 02:45:12 +0000
commit7a619ad84aaccbe511d6b4415f1ccc177f1217b9 (patch)
tree421a8847fa5c5d3774797ebe6eda584155dd3d5d /OpenSim
parent* Adds defaults for some GetBoolean config values that previously did not hav... (diff)
downloadopensim-SC_OLD-7a619ad84aaccbe511d6b4415f1ccc177f1217b9.zip
opensim-SC_OLD-7a619ad84aaccbe511d6b4415f1ccc177f1217b9.tar.gz
opensim-SC_OLD-7a619ad84aaccbe511d6b4415f1ccc177f1217b9.tar.bz2
opensim-SC_OLD-7a619ad84aaccbe511d6b4415f1ccc177f1217b9.tar.xz
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.
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Region/Environment/Scenes/Hypergrid/HGSceneCommunicationService.cs6
-rw-r--r--OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs6
2 files changed, 10 insertions, 2 deletions
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
187 agent.child = true; 187 agent.child = true;
188 if (Util.IsOutsideView(oldRegionX, newRegionX, oldRegionY, newRegionY) || isHyperLink) 188 if (Util.IsOutsideView(oldRegionX, newRegionX, oldRegionY, newRegionY) || isHyperLink)
189 { 189 {
190 Thread.Sleep(1000);
191
190 // brand new agent 192 // brand new agent
191 agent.CapsPath = Util.GetRandomCapsPath(); 193 agent.CapsPath = Util.GetRandomCapsPath();
192 if (!m_commsProvider.InterRegion.InformRegionOfChildAgent(reg.RegionHandle, agent)) 194 if (!m_commsProvider.InterRegion.InformRegionOfChildAgent(reg.RegionHandle, agent))
@@ -195,6 +197,8 @@ namespace OpenSim.Region.Environment.Scenes.Hypergrid
195 return; 197 return;
196 } 198 }
197 199
200 Thread.Sleep(2000);
201
198 // TODO Should construct this behind a method 202 // TODO Should construct this behind a method
199 capsPath = 203 capsPath =
200 "http://" + reg.ExternalHostName + ":" + reg.HttpPort 204 "http://" + reg.ExternalHostName + ":" + reg.HttpPort
@@ -262,7 +266,7 @@ namespace OpenSim.Region.Environment.Scenes.Hypergrid
262 /// 266 ///
263 267
264 avatar.MakeChildAgent(); 268 avatar.MakeChildAgent();
265 Thread.Sleep(5000); 269 Thread.Sleep(3000);
266 avatar.CrossAttachmentsIntoNewRegion(reg.RegionHandle, true); 270 avatar.CrossAttachmentsIntoNewRegion(reg.RegionHandle, true);
267 if (KiPrimitive != null) 271 if (KiPrimitive != null)
268 { 272 {
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
772 agent.child = true; 772 agent.child = true;
773 if (Util.IsOutsideView(oldRegionX, newRegionX, oldRegionY, newRegionY)) 773 if (Util.IsOutsideView(oldRegionX, newRegionX, oldRegionY, newRegionY))
774 { 774 {
775 Thread.Sleep(1000);
776
775 // brand new agent 777 // brand new agent
776 agent.CapsPath = Util.GetRandomCapsPath(); 778 agent.CapsPath = Util.GetRandomCapsPath();
777 if (!m_commsProvider.InterRegion.InformRegionOfChildAgent(reg.RegionHandle, agent)) 779 if (!m_commsProvider.InterRegion.InformRegionOfChildAgent(reg.RegionHandle, agent))
@@ -780,6 +782,8 @@ namespace OpenSim.Region.Environment.Scenes
780 return; 782 return;
781 } 783 }
782 784
785 Thread.Sleep(2000);
786
783 // TODO Should construct this behind a method 787 // TODO Should construct this behind a method
784 capsPath = 788 capsPath =
785 "http://" + reg.ExternalHostName + ":" + reg.HttpPort 789 "http://" + reg.ExternalHostName + ":" + reg.HttpPort
@@ -836,7 +840,7 @@ namespace OpenSim.Region.Environment.Scenes
836 } 840 }
837 841
838 avatar.MakeChildAgent(); 842 avatar.MakeChildAgent();
839 Thread.Sleep(5000); 843 Thread.Sleep(3000);
840 avatar.CrossAttachmentsIntoNewRegion(reg.RegionHandle, true); 844 avatar.CrossAttachmentsIntoNewRegion(reg.RegionHandle, true);
841 if (KiPrimitive != null) 845 if (KiPrimitive != null)
842 { 846 {