aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorAdam Frisby2009-05-10 20:25:05 +0000
committerAdam Frisby2009-05-10 20:25:05 +0000
commitda948a992a54164663b8fee1cd82432017672bc2 (patch)
treec1f5443a6416945d42e2d905edfd6b8054f08e9f
parentUse the new async handling class to actually make the new asset service's (diff)
downloadopensim-SC_OLD-da948a992a54164663b8fee1cd82432017672bc2.zip
opensim-SC_OLD-da948a992a54164663b8fee1cd82432017672bc2.tar.gz
opensim-SC_OLD-da948a992a54164663b8fee1cd82432017672bc2.tar.bz2
opensim-SC_OLD-da948a992a54164663b8fee1cd82432017672bc2.tar.xz
* Attempting to diagnose a core packet issue on Windows/.NET. Adding additional locks to see if it fixes the problem.
-rw-r--r--OpenSim/Region/ClientStack/LindenUDP/LLPacketQueue.cs7
1 files changed, 5 insertions, 2 deletions
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLPacketQueue.cs b/OpenSim/Region/ClientStack/LindenUDP/LLPacketQueue.cs
index 9b39292..bb0c0c7 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/LLPacketQueue.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/LLPacketQueue.cs
@@ -241,8 +241,11 @@ namespace OpenSim.Region.ClientStack.LindenUDP
241 item.TickCount = System.Environment.TickCount; 241 item.TickCount = System.Environment.TickCount;
242 if (item.Sequence == 0) 242 if (item.Sequence == 0)
243 return item; 243 return item;
244 if (contents.Remove(item.Sequence)) 244 lock (contents)
245 return item; 245 {
246 if (contents.Remove(item.Sequence))
247 return item;
248 }
246 } 249 }
247 } 250 }
248 251