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.

cpu-performance
Diva Canto 2013-07-14 10:26:05 -07:00
parent 98f59ffed5
commit c8dcb8474d
1 changed files with 5 additions and 7 deletions

View File

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