aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Region/Environment/Modules/Framework/EventQueueGetModule.cs20
1 files changed, 9 insertions, 11 deletions
diff --git a/OpenSim/Region/Environment/Modules/Framework/EventQueueGetModule.cs b/OpenSim/Region/Environment/Modules/Framework/EventQueueGetModule.cs
index 76fb141..78e2df5 100644
--- a/OpenSim/Region/Environment/Modules/Framework/EventQueueGetModule.cs
+++ b/OpenSim/Region/Environment/Modules/Framework/EventQueueGetModule.cs
@@ -77,8 +77,6 @@ namespace OpenSim.Region.Environment.Modules.Framework
77 { 77 {
78 m_gConfig = config; 78 m_gConfig = config;
79 79
80
81
82 IConfig startupConfig = m_gConfig.Configs["Startup"]; 80 IConfig startupConfig = m_gConfig.Configs["Startup"];
83 81
84 ReadConfigAndPopulate(scene, startupConfig, "Startup"); 82 ReadConfigAndPopulate(scene, startupConfig, "Startup");
@@ -285,15 +283,15 @@ namespace OpenSim.Region.Environment.Modules.Framework
285 // TODO: this has to be redone to not busy-wait (and block the thread), 283 // TODO: this has to be redone to not busy-wait (and block the thread),
286 // TODO: as soon as we have a non-blocking way to handle HTTP-requests. 284 // TODO: as soon as we have a non-blocking way to handle HTTP-requests.
287 285
288 if (m_log.IsDebugEnabled) 286// if (m_log.IsDebugEnabled)
289 { 287// {
290 String debug = "[EVENTQUEUE]: Got request for agent {0} in region {1} from thread {2}: [ "; 288// String debug = "[EVENTQUEUE]: Got request for agent {0} in region {1} from thread {2}: [ ";
291 foreach (object key in request.Keys) 289// foreach (object key in request.Keys)
292 { 290// {
293 debug += key.ToString() + "=" + request[key].ToString() + " "; 291// debug += key.ToString() + "=" + request[key].ToString() + " ";
294 } 292// }
295 m_log.DebugFormat(debug + " ]", agentID, m_scene.RegionInfo.RegionName, System.Threading.Thread.CurrentThread.Name); 293// m_log.DebugFormat(debug + " ]", agentID, m_scene.RegionInfo.RegionName, System.Threading.Thread.CurrentThread.Name);
296 } 294// }
297 295
298 BlockingLLSDQueue queue = GetQueue(agentID); 296 BlockingLLSDQueue queue = GetQueue(agentID);
299 LLSD element = queue.Dequeue(15000); // 15s timeout 297 LLSD element = queue.Dequeue(15000); // 15s timeout