aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorDiva Canto2012-02-20 11:12:02 -0800
committerDiva Canto2012-02-20 11:12:02 -0800
commit4a329098e8eba012cbf9f66627443968cbf9d726 (patch)
tree2fee031385e113c98ed39a1a69c0ee4ce7827070
parentMore improvements on agent position updates: if the target sims fail, blackli... (diff)
downloadopensim-SC_OLD-4a329098e8eba012cbf9f66627443968cbf9d726.zip
opensim-SC_OLD-4a329098e8eba012cbf9f66627443968cbf9d726.tar.gz
opensim-SC_OLD-4a329098e8eba012cbf9f66627443968cbf9d726.tar.bz2
opensim-SC_OLD-4a329098e8eba012cbf9f66627443968cbf9d726.tar.xz
Amend to last commit: synchronize access to queues.
-rw-r--r--OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs7
1 files changed, 5 insertions, 2 deletions
diff --git a/OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs b/OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs
index c45e312..65f01b3 100644
--- a/OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs
+++ b/OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs
@@ -215,8 +215,11 @@ namespace OpenSim.Services.Connectors.Simulation
215 } 215 }
216 // we get here iff success == false 216 // we get here iff success == false
217 // blacklist sim for 2 minutes 217 // blacklist sim for 2 minutes
218 _failedSims.AddOrUpdate(destination.ServerURI, true, 120); 218 lock (m_updateAgentQueue)
219 m_updateAgentQueue.Clear(); 219 {
220 _failedSims.AddOrUpdate(destination.ServerURI, true, 120);
221 m_updateAgentQueue.Remove(uri);
222 }
220 return false; 223 return false;
221 } 224 }
222 225