OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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.

0.6.1-post-fixes
diva 2008-12-20 02:45:12 +00:00
parent 7af84d7e10
commit 7a619ad84a
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
OpenSim/Region/Environment/Scenes/Hypergrid/HGSceneCommunicationService.cs
View File

@ -187,6 +187,8 @@ namespace OpenSim.Region.Environment.Scenes.Hypergrid
agent.child = true; agent.child = true;
if (Util.IsOutsideView(oldRegionX, newRegionX, oldRegionY, newRegionY) || isHyperLink) if (Util.IsOutsideView(oldRegionX, newRegionX, oldRegionY, newRegionY) || isHyperLink)
{ {
Thread.Sleep(1000);
// brand new agent // brand new agent
agent.CapsPath = Util.GetRandomCapsPath(); agent.CapsPath = Util.GetRandomCapsPath();
if (!m_commsProvider.InterRegion.InformRegionOfChildAgent(reg.RegionHandle, agent)) if (!m_commsProvider.InterRegion.InformRegionOfChildAgent(reg.RegionHandle, agent))
@ -195,6 +197,8 @@ namespace OpenSim.Region.Environment.Scenes.Hypergrid
return; return;
} }
Thread.Sleep(2000);
// TODO Should construct this behind a method // TODO Should construct this behind a method
capsPath = capsPath =
"http://" + reg.ExternalHostName + ":" + reg.HttpPort "http://" + reg.ExternalHostName + ":" + reg.HttpPort
@ -262,7 +266,7 @@ namespace OpenSim.Region.Environment.Scenes.Hypergrid
/// ///
avatar.MakeChildAgent(); avatar.MakeChildAgent();
Thread.Sleep(5000); Thread.Sleep(3000);
avatar.CrossAttachmentsIntoNewRegion(reg.RegionHandle, true); avatar.CrossAttachmentsIntoNewRegion(reg.RegionHandle, true);
if (KiPrimitive != null) if (KiPrimitive != null)
{ {

6
OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs
View File

@ -772,6 +772,8 @@ namespace OpenSim.Region.Environment.Scenes
agent.child = true; agent.child = true;
if (Util.IsOutsideView(oldRegionX, newRegionX, oldRegionY, newRegionY)) if (Util.IsOutsideView(oldRegionX, newRegionX, oldRegionY, newRegionY))
{ {
Thread.Sleep(1000);
// brand new agent // brand new agent
agent.CapsPath = Util.GetRandomCapsPath(); agent.CapsPath = Util.GetRandomCapsPath();
if (!m_commsProvider.InterRegion.InformRegionOfChildAgent(reg.RegionHandle, agent)) if (!m_commsProvider.InterRegion.InformRegionOfChildAgent(reg.RegionHandle, agent))
@ -780,6 +782,8 @@ namespace OpenSim.Region.Environment.Scenes
return; return;
} }
Thread.Sleep(2000);
// TODO Should construct this behind a method // TODO Should construct this behind a method
capsPath = capsPath =
"http://" + reg.ExternalHostName + ":" + reg.HttpPort "http://" + reg.ExternalHostName + ":" + reg.HttpPort
@ -836,7 +840,7 @@ namespace OpenSim.Region.Environment.Scenes
} }
avatar.MakeChildAgent(); avatar.MakeChildAgent();
Thread.Sleep(5000); Thread.Sleep(3000);
avatar.CrossAttachmentsIntoNewRegion(reg.RegionHandle, true); avatar.CrossAttachmentsIntoNewRegion(reg.RegionHandle, true);
if (KiPrimitive != null) if (KiPrimitive != null)
{ {