aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authordiva2008-12-19 23:58:13 +0000
committerdiva2008-12-19 23:58:13 +0000
commitb3dc462ee3af40c8d938a8b8840a9e18a8f1e4b5 (patch)
tree0aeccfb118dbfb7af10ae4b9e829e0878d1a36ce /OpenSim
parentMantis#2816. Thank you kindly, JHurliman for the beginnings of (diff)
downloadopensim-SC_OLD-b3dc462ee3af40c8d938a8b8840a9e18a8f1e4b5.zip
opensim-SC_OLD-b3dc462ee3af40c8d938a8b8840a9e18a8f1e4b5.tar.gz
opensim-SC_OLD-b3dc462ee3af40c8d938a8b8840a9e18a8f1e4b5.tar.bz2
opensim-SC_OLD-b3dc462ee3af40c8d938a8b8840a9e18a8f1e4b5.tar.xz
The previous fix for the EQ might have been too radical, and some early events now may be getting dropped because the EQ is not there yet. So, let's add an EQ immediately upon registering caps.
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Region/Environment/Modules/Framework/EventQueueGetModule.cs19
1 files changed, 4 insertions, 15 deletions
diff --git a/OpenSim/Region/Environment/Modules/Framework/EventQueueGetModule.cs b/OpenSim/Region/Environment/Modules/Framework/EventQueueGetModule.cs
index 436231b..c5930a0 100644
--- a/OpenSim/Region/Environment/Modules/Framework/EventQueueGetModule.cs
+++ b/OpenSim/Region/Environment/Modules/Framework/EventQueueGetModule.cs
@@ -195,21 +195,6 @@ namespace OpenSim.Region.Environment.Modules.Framework
195 195
196 private void OnNewClient(IClientAPI client) 196 private void OnNewClient(IClientAPI client)
197 { 197 {
198 //m_log.DebugFormat("[EVENTQUEUE]: New client {0} detected in region {1}", client.AgentId, m_scene.RegionInfo.RegionName);
199 //lock (queues)
200 //{
201 // if (queues.ContainsKey(client.AgentId))
202 // {
203 // m_log.DebugFormat("[EVENTQUEUE]: Removing old queue for agent {0} in region {1}", client.AgentId,
204 // m_scene.RegionInfo.RegionName);
205 // queues.Remove(client.AgentId);
206 // }
207
208 // m_log.DebugFormat("[EVENTQUEUE]: Adding new queue for agent {0} in region {1}", client.AgentId,
209 // m_scene.RegionInfo.RegionName);
210 // queues[client.AgentId] = new BlockingLLSDQueue();
211 //}
212
213 client.OnLogout += ClientClosed; 198 client.OnLogout += ClientClosed;
214 } 199 }
215 200
@@ -291,6 +276,10 @@ namespace OpenSim.Region.Environment.Modules.Framework
291 public void OnRegisterCaps(UUID agentID, Caps caps) 276 public void OnRegisterCaps(UUID agentID, Caps caps)
292 { 277 {
293 m_log.DebugFormat("[EVENTQUEUE] OnRegisterCaps: agentID {0} caps {1} region {2}", agentID, caps, m_scene.RegionInfo.RegionName); 278 m_log.DebugFormat("[EVENTQUEUE] OnRegisterCaps: agentID {0} caps {1} region {2}", agentID, caps, m_scene.RegionInfo.RegionName);
279
280 // Let's instantiate a Queue for this agent right now
281 TryGetQueue(agentID);
282
294 string capsBase = "/CAPS/EQG/"; 283 string capsBase = "/CAPS/EQG/";
295 UUID EventQueueGetUUID = UUID.Zero; 284 UUID EventQueueGetUUID = UUID.Zero;
296 285