diff options
author | Justin Clark-Casey (justincc) | 2013-09-18 22:56:00 +0100 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2013-09-26 20:06:32 +0100 |
commit | 1a55309ea72f090112a693763e4338535ef5add0 (patch) | |
tree | 835587529dd9eb2d0574665539cefabe4652f2c0 /OpenSim/Region/Framework/Scenes/ScenePresence.cs | |
parent | Double the time spent waiting for a UseCircuitCode packet in LLUDPServer.Hand... (diff) | |
download | opensim-SC_OLD-1a55309ea72f090112a693763e4338535ef5add0.zip opensim-SC_OLD-1a55309ea72f090112a693763e4338535ef5add0.tar.gz opensim-SC_OLD-1a55309ea72f090112a693763e4338535ef5add0.tar.bz2 opensim-SC_OLD-1a55309ea72f090112a693763e4338535ef5add0.tar.xz |
minor: Make log message when Scene.IncomingChildAgentDateUpdate() more explicit that there is a problem if it still finds the agent to be a child if the sender wanted to wait till it became root
Add some comments about the mssage sequence, though much more data is at
http://opensimulator.org/wiki/Teleports
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/ScenePresence.cs | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs index b4e8f09..d542e47 100644 --- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs +++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs | |||
@@ -1354,7 +1354,10 @@ namespace OpenSim.Region.Framework.Scenes | |||
1354 | 1354 | ||
1355 | private bool WaitForUpdateAgent(IClientAPI client) | 1355 | private bool WaitForUpdateAgent(IClientAPI client) |
1356 | { | 1356 | { |
1357 | // Before UpdateAgent, m_originRegionID is UUID.Zero; after, it's non-Zero | 1357 | // Before the source region executes UpdateAgent |
1358 | // (which triggers Scene.IncomingChildAgentDataUpdate(AgentData cAgentData) here in the destination, | ||
1359 | // m_originRegionID is UUID.Zero; after, it's non-Zero. The CompleteMovement sequence initiated from the | ||
1360 | // viewer (in turn triggered by the source region sending it a TeleportFinish event) waits until it's non-zero | ||
1358 | int count = 50; | 1361 | int count = 50; |
1359 | while (m_originRegionID.Equals(UUID.Zero) && count-- > 0) | 1362 | while (m_originRegionID.Equals(UUID.Zero) && count-- > 0) |
1360 | { | 1363 | { |