aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueGetModule.cs
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueGetModule.cs16
1 files changed, 11 insertions, 5 deletions
diff --git a/OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueGetModule.cs b/OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueGetModule.cs
index 0dbdbaf..0447bc4 100644
--- a/OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueGetModule.cs
+++ b/OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueGetModule.cs
@@ -228,12 +228,18 @@ namespace OpenSim.Region.ClientStack.Linden
228 lock (queue) 228 lock (queue)
229 queue.Enqueue(ev); 229 queue.Enqueue(ev);
230 } 230 }
231 else 231 else if (DebugLevel > 0)
232 { 232 {
233 OSDMap evMap = (OSDMap)ev; 233 ScenePresence sp = m_scene.GetScenePresence(avatarID);
234 m_log.WarnFormat( 234
235 "[EVENTQUEUE]: (Enqueue) No queue found for agent {0} when placing message {1} in region {2}", 235 // This assumes that an NPC should never have a queue.
236 avatarID, evMap["message"], m_scene.Name); 236 if (sp != null && sp.PresenceType != PresenceType.Npc)
237 {
238 OSDMap evMap = (OSDMap)ev;
239 m_log.WarnFormat(
240 "[EVENTQUEUE]: (Enqueue) No queue found for agent {0} {1} when placing message {2} in region {3}",
241 sp.Name, sp.UUID, evMap["message"], m_scene.Name);
242 }
237 } 243 }
238 } 244 }
239 catch (NullReferenceException e) 245 catch (NullReferenceException e)