Prevent spurious error message when client tries to move a null item

2 files changed, 143 insertions, 119 deletions

diff --git a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
index 83990b1..1746cfe 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
@@ -1105,6 +1105,10 @@ namespace OpenSim.Region.Framework.Scenes
         {
             SceneObjectPart part = GetSceneObjectPart(primLocalId);
 
+            // Can't move a null item
+            if (itemId == UUID.Zero)
+                return;
+
             if (null == part)
             {
                 m_log.WarnFormat(
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index 5dda9e1..8ff804b 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -214,6 +214,9 @@ namespace OpenSim.Region.Framework.Scenes
         //private int m_moveToPositionStateStatus;
         //*****************************************************
 
+        private bool m_collisionEventFlag = false;
+        private object m_collisionEventLock = new Object();
+
         protected AvatarAppearance m_appearance;
 
         public AvatarAppearance Appearance
@@ -3860,147 +3863,164 @@ namespace OpenSim.Region.Framework.Scenes
 
         private void RaiseCollisionScriptEvents(Dictionary<uint, ContactPoint> coldata)
         {
-            List<uint> thisHitColliders = new List<uint>();
-            List<uint> endedColliders = new List<uint>();
-            List<uint> startedColliders = new List<uint>();
-
-            foreach (uint localid in coldata.Keys)
-            {
-                thisHitColliders.Add(localid);
-                if (!m_lastColliders.Contains(localid))
-                {
-                    startedColliders.Add(localid);
-                }
-                //m_log.Debug("[SCENE PRESENCE]: Collided with:" + localid.ToString() + " at depth of: " + collissionswith[localid].ToString());
-            }
-            
-            // calculate things that ended colliding
-            foreach (uint localID in m_lastColliders)
+            lock(m_collisionEventLock)
             {
-                if (!thisHitColliders.Contains(localID))
-                {
-                    endedColliders.Add(localID);
-                }
-            }
-            //add the items that started colliding this time to the last colliders list.
-            foreach (uint localID in startedColliders)
-            {
-                m_lastColliders.Add(localID);
-            }
-            // remove things that ended colliding from the last colliders list
-            foreach (uint localID in endedColliders)
-            {
-                m_lastColliders.Remove(localID);
+                if (m_collisionEventFlag)
+                    return;
+                m_collisionEventFlag = true;
             }
 
-            // do event notification
-            if (startedColliders.Count > 0)
+            Util.FireAndForget(delegate(object x)
             {
-                ColliderArgs StartCollidingMessage = new ColliderArgs();
-                List<DetectedObject> colliding = new List<DetectedObject>();
-                foreach (uint localId in startedColliders)
+                try
                 {
-                    if (localId == 0)
-                        continue;
+                    List<uint> thisHitColliders = new List<uint>();
+                    List<uint> endedColliders = new List<uint>();
+                    List<uint> startedColliders = new List<uint>();
 
-                    SceneObjectPart obj = Scene.GetSceneObjectPart(localId);
-                    string data = "";
-                    if (obj != null)
+                    foreach (uint localid in coldata.Keys)
                     {
-                        DetectedObject detobj = new DetectedObject();
-                        detobj.keyUUID = obj.UUID;
-                        detobj.nameStr = obj.Name;
-                        detobj.ownerUUID = obj.OwnerID;
-                        detobj.posVector = obj.AbsolutePosition;
-                        detobj.rotQuat = obj.GetWorldRotation();
-                        detobj.velVector = obj.Velocity;
-                        detobj.colliderType = 0;
-                        detobj.groupUUID = obj.GroupID;
-                        colliding.Add(detobj);
+                        thisHitColliders.Add(localid);
+                        if (!m_lastColliders.Contains(localid))
+                        {
+                            startedColliders.Add(localid);
+                        }
+                        //m_log.Debug("[SCENE PRESENCE]: Collided with:" + localid.ToString() + " at depth of: " + collissionswith[localid].ToString());
+                    }
+                    
+                    // calculate things that ended colliding
+                    foreach (uint localID in m_lastColliders)
+                    {
+                        if (!thisHitColliders.Contains(localID))
+                        {
+                            endedColliders.Add(localID);
+                        }
+                    }
+                    //add the items that started colliding this time to the last colliders list.
+                    foreach (uint localID in startedColliders)
+                    {
+                        m_lastColliders.Add(localID);
+                    }
+                    // remove things that ended colliding from the last colliders list
+                    foreach (uint localID in endedColliders)
+                    {
+                        m_lastColliders.Remove(localID);
                     }
-                }
 
-                if (colliding.Count > 0)
-                {
-                    StartCollidingMessage.Colliders = colliding;
+                    // do event notification
+                    if (startedColliders.Count > 0)
+                    {
+                        ColliderArgs StartCollidingMessage = new ColliderArgs();
+                        List<DetectedObject> colliding = new List<DetectedObject>();
+                        foreach (uint localId in startedColliders)
+                        {
+                            if (localId == 0)
+                                continue;
 
-                    foreach (SceneObjectGroup att in GetAttachments())
-                        Scene.EventManager.TriggerScriptCollidingStart(att.LocalId, StartCollidingMessage);
-                }
-            }
+                            SceneObjectPart obj = Scene.GetSceneObjectPart(localId);
+                            string data = "";
+                            if (obj != null)
+                            {
+                                DetectedObject detobj = new DetectedObject();
+                                detobj.keyUUID = obj.UUID;
+                                detobj.nameStr = obj.Name;
+                                detobj.ownerUUID = obj.OwnerID;
+                                detobj.posVector = obj.AbsolutePosition;
+                                detobj.rotQuat = obj.GetWorldRotation();
+                                detobj.velVector = obj.Velocity;
+                                detobj.colliderType = 0;
+                                detobj.groupUUID = obj.GroupID;
+                                colliding.Add(detobj);
+                            }
+                        }
 
-            if (endedColliders.Count > 0)
-            {
-                ColliderArgs EndCollidingMessage = new ColliderArgs();
-                List<DetectedObject> colliding = new List<DetectedObject>();
-                foreach (uint localId in endedColliders)
-                {
-                    if (localId == 0)
-                        continue;
+                        if (colliding.Count > 0)
+                        {
+                            StartCollidingMessage.Colliders = colliding;
 
-                    SceneObjectPart obj = Scene.GetSceneObjectPart(localId);
-                    string data = "";
-                    if (obj != null)
-                    {
-                        DetectedObject detobj = new DetectedObject();
-                        detobj.keyUUID = obj.UUID;
-                        detobj.nameStr = obj.Name;
-                        detobj.ownerUUID = obj.OwnerID;
-                        detobj.posVector = obj.AbsolutePosition;
-                        detobj.rotQuat = obj.GetWorldRotation();
-                        detobj.velVector = obj.Velocity;
-                        detobj.colliderType = 0;
-                        detobj.groupUUID = obj.GroupID;
-                        colliding.Add(detobj);
+                            foreach (SceneObjectGroup att in GetAttachments())
+                                Scene.EventManager.TriggerScriptCollidingStart(att.LocalId, StartCollidingMessage);
+                        }
                     }
-                }
 
-                if (colliding.Count > 0)
-                {
-                    EndCollidingMessage.Colliders = colliding;
+                    if (endedColliders.Count > 0)
+                    {
+                        ColliderArgs EndCollidingMessage = new ColliderArgs();
+                        List<DetectedObject> colliding = new List<DetectedObject>();
+                        foreach (uint localId in endedColliders)
+                        {
+                            if (localId == 0)
+                                continue;
 
-                    foreach (SceneObjectGroup att in GetAttachments())
-                        Scene.EventManager.TriggerScriptCollidingEnd(att.LocalId, EndCollidingMessage);
-                }
-            }
+                            SceneObjectPart obj = Scene.GetSceneObjectPart(localId);
+                            string data = "";
+                            if (obj != null)
+                            {
+                                DetectedObject detobj = new DetectedObject();
+                                detobj.keyUUID = obj.UUID;
+                                detobj.nameStr = obj.Name;
+                                detobj.ownerUUID = obj.OwnerID;
+                                detobj.posVector = obj.AbsolutePosition;
+                                detobj.rotQuat = obj.GetWorldRotation();
+                                detobj.velVector = obj.Velocity;
+                                detobj.colliderType = 0;
+                                detobj.groupUUID = obj.GroupID;
+                                colliding.Add(detobj);
+                            }
+                        }
 
-            if (thisHitColliders.Count > 0)
-            {
-                ColliderArgs CollidingMessage = new ColliderArgs();
-                List<DetectedObject> colliding = new List<DetectedObject>();
-                foreach (uint localId in thisHitColliders)
-                {
-                    if (localId == 0)
-                        continue;
+                        if (colliding.Count > 0)
+                        {
+                            EndCollidingMessage.Colliders = colliding;
 
-                    SceneObjectPart obj = Scene.GetSceneObjectPart(localId);
-                    string data = "";
-                    if (obj != null)
-                    {
-                        DetectedObject detobj = new DetectedObject();
-                        detobj.keyUUID = obj.UUID;
-                        detobj.nameStr = obj.Name;
-                        detobj.ownerUUID = obj.OwnerID;
-                        detobj.posVector = obj.AbsolutePosition;
-                        detobj.rotQuat = obj.GetWorldRotation();
-                        detobj.velVector = obj.Velocity;
-                        detobj.colliderType = 0;
-                        detobj.groupUUID = obj.GroupID;
-                        colliding.Add(detobj);
+                            foreach (SceneObjectGroup att in GetAttachments())
+                                Scene.EventManager.TriggerScriptCollidingEnd(att.LocalId, EndCollidingMessage);
+                        }
                     }
-                }
-
-                if (colliding.Count > 0)
-                {
-                    CollidingMessage.Colliders = colliding;
 
-                    lock (m_attachments)
+                    if (thisHitColliders.Count > 0)
                     {
-                        foreach (SceneObjectGroup att in m_attachments)
-                            Scene.EventManager.TriggerScriptColliding(att.LocalId, CollidingMessage);
+                        ColliderArgs CollidingMessage = new ColliderArgs();
+                        List<DetectedObject> colliding = new List<DetectedObject>();
+                        foreach (uint localId in thisHitColliders)
+                        {
+                            if (localId == 0)
+                                continue;
+
+                            SceneObjectPart obj = Scene.GetSceneObjectPart(localId);
+                            string data = "";
+                            if (obj != null)
+                            {
+                                DetectedObject detobj = new DetectedObject();
+                                detobj.keyUUID = obj.UUID;
+                                detobj.nameStr = obj.Name;
+                                detobj.ownerUUID = obj.OwnerID;
+                                detobj.posVector = obj.AbsolutePosition;
+                                detobj.rotQuat = obj.GetWorldRotation();
+                                detobj.velVector = obj.Velocity;
+                                detobj.colliderType = 0;
+                                detobj.groupUUID = obj.GroupID;
+                                colliding.Add(detobj);
+                            }
+                        }
+
+                        if (colliding.Count > 0)
+                        {
+                            CollidingMessage.Colliders = colliding;
+
+                            lock (m_attachments)
+                            {
+                                foreach (SceneObjectGroup att in m_attachments)
+                                    Scene.EventManager.TriggerScriptColliding(att.LocalId, CollidingMessage);
+                            }
+                        }
                     }
                 }
-            }
+                finally
+                {
+                    m_collisionEventFlag = false;
+                }
+            });
         }
     }
 }