aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes/Scene.cs
diff options
context:
space:
mode:
authorUbitUmarov2014-10-19 15:51:12 +0100
committerUbitUmarov2014-10-19 15:51:12 +0100
commitf44c29effbd0d14427f288470aee028e9e09d6e3 (patch)
treee36ceb596388272eace994827f210ff56749d554 /OpenSim/Region/Framework/Scenes/Scene.cs
parent change position in new region estimation. Reduce border jitter margin (diff)
downloadopensim-SC_OLD-f44c29effbd0d14427f288470aee028e9e09d6e3.zip
opensim-SC_OLD-f44c29effbd0d14427f288470aee028e9e09d6e3.tar.gz
opensim-SC_OLD-f44c29effbd0d14427f288470aee028e9e09d6e3.tar.bz2
opensim-SC_OLD-f44c29effbd0d14427f288470aee028e9e09d6e3.tar.xz
try to fix propagation of seeds to all relevante regions
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/Scene.cs')
-rw-r--r--OpenSim/Region/Framework/Scenes/Scene.cs8
1 files changed, 7 insertions, 1 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index 829d4ce..4a6f72c 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -4558,8 +4558,14 @@ namespace OpenSim.Region.Framework.Scenes
4558 // a UseCircuitCode packet which in turn calls AddNewAgent which finally creates the ScenePresence. 4558 // a UseCircuitCode packet which in turn calls AddNewAgent which finally creates the ScenePresence.
4559 ScenePresence sp = WaitGetScenePresence(cAgentData.AgentID); 4559 ScenePresence sp = WaitGetScenePresence(cAgentData.AgentID);
4560 4560
4561 if (sp != null) 4561 if (sp != null)
4562 { 4562 {
4563 if (!sp.IsChildAgent)
4564 {
4565 m_log.WarnFormat("[SCENE]: Ignoring a child update on a root agent {0} {1} in {2}",
4566 sp.Name, sp.UUID, Name);
4567 return false;
4568 }
4563 if (cAgentData.SessionID != sp.ControllingClient.SessionId) 4569 if (cAgentData.SessionID != sp.ControllingClient.SessionId)
4564 { 4570 {
4565 m_log.WarnFormat( 4571 m_log.WarnFormat(