aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2013-08-12 19:38:23 +0100
committerJustin Clark-Casey (justincc)2013-08-12 19:38:23 +0100
commitf3edc0d8b795f665dcf2ea2feb2b7886c8a451e1 (patch)
tree387c0396f0718c3a68d468e8c8b7f417c5a6edf5 /OpenSim/Region
parentGet rid of issue where removing NPCs would through an exception by routing cl... (diff)
downloadopensim-SC_OLD-f3edc0d8b795f665dcf2ea2feb2b7886c8a451e1.zip
opensim-SC_OLD-f3edc0d8b795f665dcf2ea2feb2b7886c8a451e1.tar.gz
opensim-SC_OLD-f3edc0d8b795f665dcf2ea2feb2b7886c8a451e1.tar.bz2
opensim-SC_OLD-f3edc0d8b795f665dcf2ea2feb2b7886c8a451e1.tar.xz
minor: Extend warning message when adding trying to add an event for a client without a queue to include the event message name.
Diffstat (limited to 'OpenSim/Region')
-rw-r--r--OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueGetModule.cs11
1 files changed, 8 insertions, 3 deletions
diff --git a/OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueGetModule.cs b/OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueGetModule.cs
index d7afe1a..c28ba94 100644
--- a/OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueGetModule.cs
+++ b/OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueGetModule.cs
@@ -229,7 +229,12 @@ namespace OpenSim.Region.ClientStack.Linden
229 queue.Enqueue(ev); 229 queue.Enqueue(ev);
230 } 230 }
231 else 231 else
232 m_log.WarnFormat("[EVENTQUEUE]: (Enqueue) No queue found for agent {0} in region {1}", avatarID, m_scene.RegionInfo.RegionName); 232 {
233 OSDMap evMap = (OSDMap)ev;
234 m_log.WarnFormat(
235 "[EVENTQUEUE]: (Enqueue) No queue found for agent {0} when placing message {1} in region {2}",
236 avatarID, evMap["message"], m_scene.Name);
237 }
233 } 238 }
234 catch (NullReferenceException e) 239 catch (NullReferenceException e)
235 { 240 {
@@ -365,14 +370,14 @@ namespace OpenSim.Region.ClientStack.Linden
365 OSDMap ev = (OSDMap)element; 370 OSDMap ev = (OSDMap)element;
366 m_log.DebugFormat( 371 m_log.DebugFormat(
367 "Eq OUT {0,-30} to {1,-20} {2,-20}", 372 "Eq OUT {0,-30} to {1,-20} {2,-20}",
368 ev["message"], m_scene.GetScenePresence(agentId).Name, m_scene.RegionInfo.RegionName); 373 ev["message"], m_scene.GetScenePresence(agentId).Name, m_scene.Name);
369 } 374 }
370 } 375 }
371 376
372 public Hashtable GetEvents(UUID requestID, UUID pAgentId) 377 public Hashtable GetEvents(UUID requestID, UUID pAgentId)
373 { 378 {
374 if (DebugLevel >= 2) 379 if (DebugLevel >= 2)
375 m_log.WarnFormat("POLLED FOR EQ MESSAGES BY {0} in {1}", pAgentId, m_scene.RegionInfo.RegionName); 380 m_log.WarnFormat("POLLED FOR EQ MESSAGES BY {0} in {1}", pAgentId, m_scene.Name);
376 381
377 Queue<OSD> queue = GetQueue(pAgentId); 382 Queue<OSD> queue = GetQueue(pAgentId);
378 if (queue == null) 383 if (queue == null)