OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Change IsLocalRegion from using region handle to using regionID. This was affecting UpdateAgent and CloseAgent in cases where the foreign region is on the same coordinates as *some* local region.

cpu-performance
Diva Canto 2013-06-22 08:29:06 -07:00
parent ca3ce6da73
commit 6c7e33fe47
3 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/RemoteSimulationConnector.cs
View File

@ -194,7 +194,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Simulation
return false; return false;
// Try local first // Try local first
if (m_localBackend.IsLocalRegion(destination.RegionHandle)) if (m_localBackend.IsLocalRegion(destination.RegionID))
return m_localBackend.UpdateAgent(destination, cAgentData); return m_localBackend.UpdateAgent(destination, cAgentData);
return m_remoteConnector.UpdateAgent(destination, cAgentData); return m_remoteConnector.UpdateAgent(destination, cAgentData);
@ -206,7 +206,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Simulation
return false; return false;
// Try local first // Try local first
if (m_localBackend.IsLocalRegion(destination.RegionHandle)) if (m_localBackend.IsLocalRegion(destination.RegionID))
return m_localBackend.UpdateAgent(destination, cAgentData); return m_localBackend.UpdateAgent(destination, cAgentData);
return m_remoteConnector.UpdateAgent(destination, cAgentData); return m_remoteConnector.UpdateAgent(destination, cAgentData);
@ -224,7 +224,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Simulation
return true; return true;
// else do the remote thing // else do the remote thing
if (!m_localBackend.IsLocalRegion(destination.RegionHandle)) if (!m_localBackend.IsLocalRegion(destination.RegionID))
return m_remoteConnector.RetrieveAgent(destination, id, out agent); return m_remoteConnector.RetrieveAgent(destination, id, out agent);
return false; return false;
@ -273,7 +273,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Simulation
return true; return true;
// else do the remote thing // else do the remote thing
if (!m_localBackend.IsLocalRegion(destination.RegionHandle)) if (!m_localBackend.IsLocalRegion(destination.RegionID))
return m_remoteConnector.CloseAgent(destination, id); return m_remoteConnector.CloseAgent(destination, id);
return false; return false;
@ -296,7 +296,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Simulation
} }
// else do the remote thing // else do the remote thing
if (!m_localBackend.IsLocalRegion(destination.RegionHandle)) if (!m_localBackend.IsLocalRegion(destination.RegionID))
return m_remoteConnector.CreateObject(destination, newPosition, sog, isLocalCall); return m_remoteConnector.CreateObject(destination, newPosition, sog, isLocalCall);
return false; return false;

1
OpenSim/Server/Handlers/Simulation/AgentHandlers.cs
View File

@ -576,7 +576,6 @@ namespace OpenSim.Server.Handlers.Simulation
//agent.Dump(); //agent.Dump();
// This is one of the meanings of PUT agent // This is one of the meanings of PUT agent
result = UpdateAgent(destination, agent); result = UpdateAgent(destination, agent);
} }
else if ("AgentPosition".Equals(messageType)) else if ("AgentPosition".Equals(messageType))
{ {

2
OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs
View File

@ -241,7 +241,7 @@ namespace OpenSim.Services.Connectors.Simulation
/// </summary> /// </summary>
private bool UpdateAgent(GridRegion destination, IAgentData cAgentData, int timeout) private bool UpdateAgent(GridRegion destination, IAgentData cAgentData, int timeout)
{ {
// m_log.DebugFormat("[REMOTE SIMULATION CONNECTOR]: UpdateAgent start"); // m_log.DebugFormat("[REMOTE SIMULATION CONNECTOR]: UpdateAgent in {0}", destination.ServerURI);
// Eventually, we want to use a caps url instead of the agentID // Eventually, we want to use a caps url instead of the agentID
string uri = destination.ServerURI + AgentPath() + cAgentData.AgentID + "/"; string uri = destination.ServerURI + AgentPath() + cAgentData.AgentID + "/";