aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs
diff options
context:
space:
mode:
authordiva2008-12-20 02:45:12 +0000
committerdiva2008-12-20 02:45:12 +0000
commit7a619ad84aaccbe511d6b4415f1ccc177f1217b9 (patch)
tree421a8847fa5c5d3774797ebe6eda584155dd3d5d /OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs
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/Region/Environment/Scenes/SceneCommunicationService.cs')
-rw-r--r--OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs6
1 files changed, 5 insertions, 1 deletions
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 {