aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2013-09-02 17:45:38 +0100
committerJustin Clark-Casey (justincc)2013-09-02 17:47:04 +0100
commit935888d6da800520f50f0ec026b496d05bcb34dc (patch)
treeebb6118f40413d55c4a3e088c515840060d356d2
parentAlso check user authorization if looking to upgrade from a child to a root ag... (diff)
downloadopensim-SC_OLD-935888d6da800520f50f0ec026b496d05bcb34dc.zip
opensim-SC_OLD-935888d6da800520f50f0ec026b496d05bcb34dc.tar.gz
opensim-SC_OLD-935888d6da800520f50f0ec026b496d05bcb34dc.tar.bz2
opensim-SC_OLD-935888d6da800520f50f0ec026b496d05bcb34dc.tar.xz
Comment out warning about agent updating without valid session ID for now.
This causes extreme console spam if a simulator running latest master and one running 0.7.5 have adjacent regions occupied by avatars.
-rw-r--r--OpenSim/Region/Framework/Scenes/Scene.cs8
1 files changed, 4 insertions, 4 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index e0c96c6..051c617 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -4359,10 +4359,10 @@ namespace OpenSim.Region.Framework.Scenes
4359 ScenePresence childAgentUpdate = GetScenePresence(cAgentData.AgentID); 4359 ScenePresence childAgentUpdate = GetScenePresence(cAgentData.AgentID);
4360 if (childAgentUpdate != null) 4360 if (childAgentUpdate != null)
4361 { 4361 {
4362 if (childAgentUpdate.ControllingClient.SessionId != cAgentData.SessionID) 4362// if (childAgentUpdate.ControllingClient.SessionId != cAgentData.SessionID)
4363 // Only warn for now 4363// // Only warn for now
4364 m_log.WarnFormat("[SCENE]: Attempt at updating position of agent {0} with invalid session id {1}. Neighbor running older version?", 4364// m_log.WarnFormat("[SCENE]: Attempt at updating position of agent {0} with invalid session id {1}. Neighbor running older version?",
4365 childAgentUpdate.UUID, cAgentData.SessionID); 4365// childAgentUpdate.UUID, cAgentData.SessionID);
4366 4366
4367 // I can't imagine *yet* why we would get an update if the agent is a root agent.. 4367 // I can't imagine *yet* why we would get an update if the agent is a root agent..
4368 // however to avoid a race condition crossing borders.. 4368 // however to avoid a race condition crossing borders..