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

Slowing things down even more on TPs, to see if that helps the European folks connected to osgrid.

0.6.2-post-fixes
diva 2008-12-20 22:44:26 +00:00
parent 62dd67b8b8
commit 3dae92b850
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -251,7 +251,7 @@ namespace OpenSim.Region.Environment.Scenes.Hypergrid
// return; // return;
//} //}
Thread.Sleep(2000); Thread.Sleep(5000);
m_log.DebugFormat( m_log.DebugFormat(
"[CAPS]: Sending new CAPS seed url {0} to client {1}", agent.CapsPath, avatar.UUID); "[CAPS]: Sending new CAPS seed url {0} to client {1}", agent.CapsPath, avatar.UUID);
@ -293,6 +293,7 @@ namespace OpenSim.Region.Environment.Scenes.Hypergrid
/// ///
if (Util.IsOutsideView(oldRegionX, newRegionX, oldRegionY, newRegionY) || isHyperLink) if (Util.IsOutsideView(oldRegionX, newRegionX, oldRegionY, newRegionY) || isHyperLink)
{ {
Thread.Sleep(2000);
CloseConnection(avatar.UUID); CloseConnection(avatar.UUID);
} }
// if (teleport success) // seems to be always success here // if (teleport success) // seems to be always success here

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

@ -821,7 +821,9 @@ namespace OpenSim.Region.Environment.Scenes
+ "/CAPS/" + agent.CapsPath + "0000/"; + "/CAPS/" + agent.CapsPath + "0000/";
} }
// Expect avatar crossing is a heavy-duty function at the destination.
// That is where MakeRoot is called, which fetches appearance and inventory.
// Plus triggers OnMakeRoot, which spawns a series of asynchronous updates.
m_commsProvider.InterRegion.ExpectAvatarCrossing(reg.RegionHandle, avatar.ControllingClient.AgentId, m_commsProvider.InterRegion.ExpectAvatarCrossing(reg.RegionHandle, avatar.ControllingClient.AgentId,
position, false); position, false);
//{ //{
@ -833,7 +835,7 @@ namespace OpenSim.Region.Environment.Scenes
// return; // return;
//} //}
Thread.Sleep(2000); Thread.Sleep(5000);
m_log.DebugFormat( m_log.DebugFormat(
"[CAPS]: Sending new CAPS seed url {0} to client {1}", capsPath, avatar.UUID); "[CAPS]: Sending new CAPS seed url {0} to client {1}", capsPath, avatar.UUID);
@ -864,6 +866,7 @@ namespace OpenSim.Region.Environment.Scenes
if (Util.IsOutsideView(oldRegionX, newRegionX, oldRegionY, newRegionY)) if (Util.IsOutsideView(oldRegionX, newRegionX, oldRegionY, newRegionY))
{ {
Thread.Sleep(2000);
CloseConnection(avatar.UUID); CloseConnection(avatar.UUID);
} }