aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authordiva2008-12-24 05:05:22 +0000
committerdiva2008-12-24 05:05:22 +0000
commita647a1989427f5ce6df9e9f4b7ccd6c0a6565558 (patch)
tree8464b5d2b1a8906689e3144af2d8d306c70cb441
parentBacking off from the accidental removal one of the most valued 'features' of ... (diff)
downloadopensim-SC-a647a1989427f5ce6df9e9f4b7ccd6c0a6565558.zip
opensim-SC-a647a1989427f5ce6df9e9f4b7ccd6c0a6565558.tar.gz
opensim-SC-a647a1989427f5ce6df9e9f4b7ccd6c0a6565558.tar.bz2
opensim-SC-a647a1989427f5ce6df9e9f4b7ccd6c0a6565558.tar.xz
Better test on EQ shutdown.
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/Environment/Modules/Framework/EventQueueGetModule.cs5
1 files changed, 4 insertions, 1 deletions
diff --git a/OpenSim/Region/Environment/Modules/Framework/EventQueueGetModule.cs b/OpenSim/Region/Environment/Modules/Framework/EventQueueGetModule.cs
index e395492..dc2a70c 100644
--- a/OpenSim/Region/Environment/Modules/Framework/EventQueueGetModule.cs
+++ b/OpenSim/Region/Environment/Modules/Framework/EventQueueGetModule.cs
@@ -208,8 +208,11 @@ namespace OpenSim.Region.Environment.Modules.Framework
208 { 208 {
209 m_log.DebugFormat("[EVENTQUEUE]: Closed client {0} in region {1}", AgentID, m_scene.RegionInfo.RegionName); 209 m_log.DebugFormat("[EVENTQUEUE]: Closed client {0} in region {1}", AgentID, m_scene.RegionInfo.RegionName);
210 210
211 while ((queues[AgentID] != null) && queues[AgentID].Count() > 0) 211 int count = 0;
212 while (queues.ContainsKey(AgentID) && queues[AgentID].Count() > 0 && count++ < 5)
213 {
212 Thread.Sleep(1000); 214 Thread.Sleep(1000);
215 }
213 216
214 lock (queues) 217 lock (queues)
215 { 218 {