Prevent spurious error message when client tries to move a null item
Melanie
parent
6b080d57cb
commit
db98698bbe
|
|
@ -1105,6 +1105,10 @@ namespace OpenSim.Region.Framework.Scenes
|
||||||
{
|
{
|
||||||
SceneObjectPart part = GetSceneObjectPart(primLocalId);
|
SceneObjectPart part = GetSceneObjectPart(primLocalId);
|
||||||
|
|
||||||
|
// Can't move a null item
|
||||||
|
if (itemId == UUID.Zero)
|
||||||
|
return;
|
||||||
|
|
||||||
if (null == part)
|
if (null == part)
|
||||||
{
|
{
|
||||||
m_log.WarnFormat(
|
m_log.WarnFormat(
|
||||||
|
|
|
||||||
|
|
@ -214,6 +214,9 @@ namespace OpenSim.Region.Framework.Scenes
|
||||||
//private int m_moveToPositionStateStatus;
|
//private int m_moveToPositionStateStatus;
|
||||||
//*****************************************************
|
//*****************************************************
|
||||||
|
|
||||||
|
private bool m_collisionEventFlag = false;
|
||||||
|
private object m_collisionEventLock = new Object();
|
||||||
|
|
||||||
protected AvatarAppearance m_appearance;
|
protected AvatarAppearance m_appearance;
|
||||||
|
|
||||||
public AvatarAppearance Appearance
|
public AvatarAppearance Appearance
|
||||||
|
|
@ -3860,147 +3863,164 @@ namespace OpenSim.Region.Framework.Scenes
|
||||||
|
|
||||||
private void RaiseCollisionScriptEvents(Dictionary<uint, ContactPoint> coldata)
|
private void RaiseCollisionScriptEvents(Dictionary<uint, ContactPoint> coldata)
|
||||||
{
|
{
|
||||||
List<uint> thisHitColliders = new List<uint>();
|
lock(m_collisionEventLock)
|
||||||
List<uint> endedColliders = new List<uint>();
|
|
||||||
List<uint> startedColliders = new List<uint>();
|
|
||||||
|
|
||||||
foreach (uint localid in coldata.Keys)
|
|
||||||
{
|
{
|
||||||
thisHitColliders.Add(localid);
|
if (m_collisionEventFlag)
|
||||||
if (!m_lastColliders.Contains(localid))
|
return;
|
||||||
|
m_collisionEventFlag = true;
|
||||||
|
}
|
||||||
|
|
||||||
|
Util.FireAndForget(delegate(object x)
|
||||||
|
{
|
||||||
|
try
|
||||||
{
|
{
|
||||||
startedColliders.Add(localid);
|
List<uint> thisHitColliders = new List<uint>();
|
||||||
}
|
List<uint> endedColliders = new List<uint>();
|
||||||
//m_log.Debug("[SCENE PRESENCE]: Collided with:" + localid.ToString() + " at depth of: " + collissionswith[localid].ToString());
|
List<uint> startedColliders = new List<uint>();
|
||||||
}
|
|
||||||
|
|
||||||
// calculate things that ended colliding
|
foreach (uint localid in coldata.Keys)
|
||||||
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);
|
|
||||||
}
|
|
||||||
|
|
||||||
// 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;
|
|
||||||
|
|
||||||
SceneObjectPart obj = Scene.GetSceneObjectPart(localId);
|
|
||||||
string data = "";
|
|
||||||
if (obj != null)
|
|
||||||
{
|
{
|
||||||
DetectedObject detobj = new DetectedObject();
|
thisHitColliders.Add(localid);
|
||||||
detobj.keyUUID = obj.UUID;
|
if (!m_lastColliders.Contains(localid))
|
||||||
detobj.nameStr = obj.Name;
|
{
|
||||||
detobj.ownerUUID = obj.OwnerID;
|
startedColliders.Add(localid);
|
||||||
detobj.posVector = obj.AbsolutePosition;
|
}
|
||||||
detobj.rotQuat = obj.GetWorldRotation();
|
//m_log.Debug("[SCENE PRESENCE]: Collided with:" + localid.ToString() + " at depth of: " + collissionswith[localid].ToString());
|
||||||
detobj.velVector = obj.Velocity;
|
}
|
||||||
detobj.colliderType = 0;
|
|
||||||
detobj.groupUUID = obj.GroupID;
|
// calculate things that ended colliding
|
||||||
colliding.Add(detobj);
|
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);
|
||||||
|
}
|
||||||
|
|
||||||
|
// 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;
|
||||||
|
|
||||||
|
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)
|
||||||
|
{
|
||||||
|
StartCollidingMessage.Colliders = colliding;
|
||||||
|
|
||||||
|
foreach (SceneObjectGroup att in GetAttachments())
|
||||||
|
Scene.EventManager.TriggerScriptCollidingStart(att.LocalId, StartCollidingMessage);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if (endedColliders.Count > 0)
|
||||||
|
{
|
||||||
|
ColliderArgs EndCollidingMessage = new ColliderArgs();
|
||||||
|
List<DetectedObject> colliding = new List<DetectedObject>();
|
||||||
|
foreach (uint localId in endedColliders)
|
||||||
|
{
|
||||||
|
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)
|
||||||
|
{
|
||||||
|
EndCollidingMessage.Colliders = colliding;
|
||||||
|
|
||||||
|
foreach (SceneObjectGroup att in GetAttachments())
|
||||||
|
Scene.EventManager.TriggerScriptCollidingEnd(att.LocalId, EndCollidingMessage);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if (thisHitColliders.Count > 0)
|
||||||
|
{
|
||||||
|
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
|
||||||
if (colliding.Count > 0)
|
|
||||||
{
|
{
|
||||||
StartCollidingMessage.Colliders = colliding;
|
m_collisionEventFlag = false;
|
||||||
|
|
||||||
foreach (SceneObjectGroup att in GetAttachments())
|
|
||||||
Scene.EventManager.TriggerScriptCollidingStart(att.LocalId, StartCollidingMessage);
|
|
||||||
}
|
}
|
||||||
}
|
});
|
||||||
|
|
||||||
if (endedColliders.Count > 0)
|
|
||||||
{
|
|
||||||
ColliderArgs EndCollidingMessage = new ColliderArgs();
|
|
||||||
List<DetectedObject> colliding = new List<DetectedObject>();
|
|
||||||
foreach (uint localId in endedColliders)
|
|
||||||
{
|
|
||||||
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)
|
|
||||||
{
|
|
||||||
EndCollidingMessage.Colliders = colliding;
|
|
||||||
|
|
||||||
foreach (SceneObjectGroup att in GetAttachments())
|
|
||||||
Scene.EventManager.TriggerScriptCollidingEnd(att.LocalId, EndCollidingMessage);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if (thisHitColliders.Count > 0)
|
|
||||||
{
|
|
||||||
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);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue