aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorDiva Canto2013-07-14 10:26:05 -0700
committerDiva Canto2013-07-14 10:26:05 -0700
commitc8dcb8474d0b0698168863328e61a6929bb0770f (patch)
treea143865b978d009bc9f20dc5faebfebdfdef40cb /OpenSim
parentFix broken tests -- the test setup was wrong... sigh. (diff)
downloadopensim-SC_OLD-c8dcb8474d0b0698168863328e61a6929bb0770f.zip
opensim-SC_OLD-c8dcb8474d0b0698168863328e61a6929bb0770f.tar.gz
opensim-SC_OLD-c8dcb8474d0b0698168863328e61a6929bb0770f.tar.bz2
opensim-SC_OLD-c8dcb8474d0b0698168863328e61a6929bb0770f.tar.xz
Let's go easy on authenticating ChildAgentUpdates, otherwise this will be chaotic while ppl are using different versions of opensim. Warning only, but no enforcement.
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Region/Framework/Scenes/Scene.cs12
1 files changed, 5 insertions, 7 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index b07faa2..9cfe869 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -4202,17 +4202,15 @@ namespace OpenSim.Region.Framework.Scenes
4202 4202
4203 if (childAgentUpdate != null) 4203 if (childAgentUpdate != null)
4204 { 4204 {
4205 if (cAgentData.SessionID == childAgentUpdate.ControllingClient.SessionId) 4205 if (cAgentData.SessionID != childAgentUpdate.ControllingClient.SessionId)
4206 { 4206 {
4207 childAgentUpdate.ChildAgentDataUpdate(cAgentData); 4207 m_log.WarnFormat("[SCENE]: Attempt to update agent {0} with invalid session id {1} (possibly from simulator in older version; tell them to update).", childAgentUpdate.UUID, cAgentData.SessionID);
4208 return true;
4209 }
4210 else
4211 {
4212 m_log.WarnFormat("[SCENE]: Attempt to update agent {0} with invalid session id {1}", childAgentUpdate.UUID, cAgentData.SessionID);
4213 Console.WriteLine(String.Format("[SCENE]: Attempt to update agent {0} ({1}) with invalid session id {2}", 4208 Console.WriteLine(String.Format("[SCENE]: Attempt to update agent {0} ({1}) with invalid session id {2}",
4214 childAgentUpdate.UUID, childAgentUpdate.ControllingClient.SessionId, cAgentData.SessionID)); 4209 childAgentUpdate.UUID, childAgentUpdate.ControllingClient.SessionId, cAgentData.SessionID));
4215 } 4210 }
4211
4212 childAgentUpdate.ChildAgentDataUpdate(cAgentData);
4213 return true;
4216 } 4214 }
4217 return false; 4215 return false;
4218 } 4216 }