diff options
author | Melanie | 2009-10-27 11:32:11 +0000 |
---|---|---|
committer | Melanie | 2009-10-27 11:32:11 +0000 |
commit | 31a848e97bd984ab0a85feca397ce419f6ae839a (patch) | |
tree | 4743f5eb7c12b3723ed4b986d19714d1b3a0a3ea /OpenSim/Framework/ClientManager.cs | |
parent | Commented out instrumentation in ODEPrim.cs (diff) | |
parent | Finally hunted down the Parallel deadlock. Packets were being handled asynchr... (diff) | |
download | opensim-SC-31a848e97bd984ab0a85feca397ce419f6ae839a.zip opensim-SC-31a848e97bd984ab0a85feca397ce419f6ae839a.tar.gz opensim-SC-31a848e97bd984ab0a85feca397ce419f6ae839a.tar.bz2 opensim-SC-31a848e97bd984ab0a85feca397ce419f6ae839a.tar.xz |
Merge branch 'master' into vehicles
Diffstat (limited to 'OpenSim/Framework/ClientManager.cs')
-rw-r--r-- | OpenSim/Framework/ClientManager.cs | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/OpenSim/Framework/ClientManager.cs b/OpenSim/Framework/ClientManager.cs index 61b59e7..baff2f4 100644 --- a/OpenSim/Framework/ClientManager.cs +++ b/OpenSim/Framework/ClientManager.cs | |||
@@ -204,7 +204,10 @@ namespace OpenSim.Framework | |||
204 | public void ForEach(Action<IClientAPI> action) | 204 | public void ForEach(Action<IClientAPI> action) |
205 | { | 205 | { |
206 | IClientAPI[] localArray = m_array; | 206 | IClientAPI[] localArray = m_array; |
207 | Parallel.ForEach<IClientAPI>(localArray, action); | 207 | Parallel.For(0, localArray.Length, |
208 | delegate(int i) | ||
209 | { action(localArray[i]); } | ||
210 | ); | ||
208 | } | 211 | } |
209 | 212 | ||
210 | /// <summary> | 213 | /// <summary> |