aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes/Scene.cs
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2013-09-18 22:56:00 +0100
committerJustin Clark-Casey (justincc)2013-09-26 20:06:32 +0100
commit1a55309ea72f090112a693763e4338535ef5add0 (patch)
tree835587529dd9eb2d0574665539cefabe4652f2c0 /OpenSim/Region/Framework/Scenes/Scene.cs
parentDouble the time spent waiting for a UseCircuitCode packet in LLUDPServer.Hand... (diff)
downloadopensim-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 'OpenSim/Region/Framework/Scenes/Scene.cs')
-rw-r--r--OpenSim/Region/Framework/Scenes/Scene.cs11
1 files changed, 8 insertions, 3 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index e00206f..6c9a8df 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -4338,9 +4338,14 @@ namespace OpenSim.Region.Framework.Scenes
4338 while (sp.IsChildAgent && ntimes-- > 0) 4338 while (sp.IsChildAgent && ntimes-- > 0)
4339 Thread.Sleep(1000); 4339 Thread.Sleep(1000);
4340 4340
4341 m_log.DebugFormat( 4341 if (sp.IsChildAgent)
4342 "[SCENE]: Found presence {0} {1} {2} in {3} after {4} waits", 4342 m_log.DebugFormat(
4343 sp.Name, sp.UUID, sp.IsChildAgent ? "child" : "root", Name, 20 - ntimes); 4343 "[SCENE]: Found presence {0} {1} unexpectedly still child in {2}",
4344 sp.Name, sp.UUID, Name);
4345 else
4346 m_log.DebugFormat(
4347 "[SCENE]: Found presence {0} {1} as root in {2} after {3} waits",
4348 sp.Name, sp.UUID, Name, 20 - ntimes);
4344 4349
4345 if (sp.IsChildAgent) 4350 if (sp.IsChildAgent)
4346 return false; 4351 return false;