diff options
| author | Justin Clark-Casey (justincc) | 2014-02-12 23:23:56 +0000 |
|---|---|---|
| committer | Justin Clark-Casey (justincc) | 2014-02-12 23:23:56 +0000 |
| commit | bc7fda39b496bb9fe45c96fd0df2a349ea3e5045 (patch) | |
| tree | eea59a3847ef88ad96d6ca035a5f4eb2b9ccb6eb /OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueGetModule.cs | |
| parent | BulletSim: the minimum vehicle velocity was set too low so moving slow (diff) | |
| parent | If a caller tries to queue a CAPs message to a scene presence that has no eve... (diff) | |
| download | opensim-SC-bc7fda39b496bb9fe45c96fd0df2a349ea3e5045.zip opensim-SC-bc7fda39b496bb9fe45c96fd0df2a349ea3e5045.tar.gz opensim-SC-bc7fda39b496bb9fe45c96fd0df2a349ea3e5045.tar.bz2 opensim-SC-bc7fda39b496bb9fe45c96fd0df2a349ea3e5045.tar.xz | |
Merge branch 'justincc-master'
Diffstat (limited to 'OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueGetModule.cs')
| -rw-r--r-- | OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueGetModule.cs | 16 |
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 f98337d..b162bb9 100644 --- a/OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueGetModule.cs +++ b/OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueGetModule.cs | |||
| @@ -229,12 +229,18 @@ namespace OpenSim.Region.ClientStack.Linden | |||
| 229 | lock (queue) | 229 | lock (queue) |
| 230 | queue.Enqueue(ev); | 230 | queue.Enqueue(ev); |
| 231 | } | 231 | } |
| 232 | else | 232 | else if (DebugLevel > 0) |
| 233 | { | 233 | { |
| 234 | OSDMap evMap = (OSDMap)ev; | 234 | ScenePresence sp = m_scene.GetScenePresence(avatarID); |
| 235 | m_log.WarnFormat( | 235 | |
| 236 | "[EVENTQUEUE]: (Enqueue) No queue found for agent {0} when placing message {1} in region {2}", | 236 | // This assumes that an NPC should never have a queue. |
| 237 | avatarID, evMap["message"], m_scene.Name); | 237 | if (sp != null && sp.PresenceType != PresenceType.Npc) |
| 238 | { | ||
| 239 | OSDMap evMap = (OSDMap)ev; | ||
| 240 | m_log.WarnFormat( | ||
| 241 | "[EVENTQUEUE]: (Enqueue) No queue found for agent {0} {1} when placing message {2} in region {3}", | ||
| 242 | sp.Name, sp.UUID, evMap["message"], m_scene.Name); | ||
| 243 | } | ||
| 238 | } | 244 | } |
| 239 | } | 245 | } |
| 240 | catch (NullReferenceException e) | 246 | catch (NullReferenceException e) |