From c8dcb8474d0b0698168863328e61a6929bb0770f Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Sun, 14 Jul 2013 10:26:05 -0700
Subject: 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.

---
 OpenSim/Region/Framework/Scenes/Scene.cs | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

(limited to 'OpenSim/Region/Framework/Scenes/Scene.cs')

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
 
             if (childAgentUpdate != null)
             {
-                if (cAgentData.SessionID == childAgentUpdate.ControllingClient.SessionId)
+                if (cAgentData.SessionID != childAgentUpdate.ControllingClient.SessionId)
                 {
-                    childAgentUpdate.ChildAgentDataUpdate(cAgentData);
-                    return true;
-                }
-                else
-                {
-                    m_log.WarnFormat("[SCENE]: Attempt to update agent {0} with invalid session id {1}", childAgentUpdate.UUID, cAgentData.SessionID);
+                    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);
                     Console.WriteLine(String.Format("[SCENE]: Attempt to update agent {0} ({1}) with invalid session id {2}", 
                         childAgentUpdate.UUID, childAgentUpdate.ControllingClient.SessionId, cAgentData.SessionID));
                 }
+
+                childAgentUpdate.ChildAgentDataUpdate(cAgentData);
+                return true;
             }
             return false;
         }
-- 
cgit v1.1