diff options
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Physics/OdePlugin/ODERayCastRequestManager.cs | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/OpenSim/Region/Physics/OdePlugin/ODERayCastRequestManager.cs b/OpenSim/Region/Physics/OdePlugin/ODERayCastRequestManager.cs index 9d7aa94..7e3ec63 100644 --- a/OpenSim/Region/Physics/OdePlugin/ODERayCastRequestManager.cs +++ b/OpenSim/Region/Physics/OdePlugin/ODERayCastRequestManager.cs | |||
@@ -378,12 +378,13 @@ namespace OpenSim.Region.Physics.OdePlugin | |||
378 | // Loop over contacts, build results. | 378 | // Loop over contacts, build results. |
379 | for (int i = 0; i < count; i++) | 379 | for (int i = 0; i < count; i++) |
380 | { | 380 | { |
381 | if (p1 != null) { | 381 | if (p1 != null) |
382 | { | ||
382 | if (p1 is OdePrim) | 383 | if (p1 is OdePrim) |
383 | { | 384 | { |
384 | ContactResult collisionresult = new ContactResult(); | 385 | ContactResult collisionresult = new ContactResult(); |
385 | 386 | ||
386 | collisionresult.ConsumerID = ((OdePrim)p1).m_localID; | 387 | collisionresult.ConsumerID = p1.LocalID; |
387 | collisionresult.Pos = new Vector3(contacts[i].pos.X, contacts[i].pos.Y, contacts[i].pos.Z); | 388 | collisionresult.Pos = new Vector3(contacts[i].pos.X, contacts[i].pos.Y, contacts[i].pos.Z); |
388 | collisionresult.Depth = contacts[i].depth; | 389 | collisionresult.Depth = contacts[i].depth; |
389 | collisionresult.Normal = new Vector3(contacts[i].normal.X, contacts[i].normal.Y, | 390 | collisionresult.Normal = new Vector3(contacts[i].normal.X, contacts[i].normal.Y, |
@@ -399,7 +400,7 @@ namespace OpenSim.Region.Physics.OdePlugin | |||
399 | { | 400 | { |
400 | ContactResult collisionresult = new ContactResult(); | 401 | ContactResult collisionresult = new ContactResult(); |
401 | 402 | ||
402 | collisionresult.ConsumerID = ((OdePrim)p2).m_localID; | 403 | collisionresult.ConsumerID = p2.LocalID; |
403 | collisionresult.Pos = new Vector3(contacts[i].pos.X, contacts[i].pos.Y, contacts[i].pos.Z); | 404 | collisionresult.Pos = new Vector3(contacts[i].pos.X, contacts[i].pos.Y, contacts[i].pos.Z); |
404 | collisionresult.Depth = contacts[i].depth; | 405 | collisionresult.Depth = contacts[i].depth; |
405 | collisionresult.Normal = new Vector3(contacts[i].normal.X, contacts[i].normal.Y, | 406 | collisionresult.Normal = new Vector3(contacts[i].normal.X, contacts[i].normal.Y, |