diff options
Diffstat (limited to 'OpenSim/Region/Physics/OdePlugin/ODERayCastRequestManager.cs')
-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 6c2bdde..8d7d3b3 100644 --- a/OpenSim/Region/Physics/OdePlugin/ODERayCastRequestManager.cs +++ b/OpenSim/Region/Physics/OdePlugin/ODERayCastRequestManager.cs | |||
@@ -371,12 +371,13 @@ namespace OpenSim.Region.Physics.OdePlugin | |||
371 | // Loop over contacts, build results. | 371 | // Loop over contacts, build results. |
372 | for (int i = 0; i < count; i++) | 372 | for (int i = 0; i < count; i++) |
373 | { | 373 | { |
374 | if (p1 != null) { | 374 | if (p1 != null) |
375 | { | ||
375 | if (p1 is OdePrim) | 376 | if (p1 is OdePrim) |
376 | { | 377 | { |
377 | ContactResult collisionresult = new ContactResult(); | 378 | ContactResult collisionresult = new ContactResult(); |
378 | 379 | ||
379 | collisionresult.ConsumerID = ((OdePrim)p1).m_localID; | 380 | collisionresult.ConsumerID = p1.LocalID; |
380 | collisionresult.Pos = new Vector3(contacts[i].pos.X, contacts[i].pos.Y, contacts[i].pos.Z); | 381 | collisionresult.Pos = new Vector3(contacts[i].pos.X, contacts[i].pos.Y, contacts[i].pos.Z); |
381 | collisionresult.Depth = contacts[i].depth; | 382 | collisionresult.Depth = contacts[i].depth; |
382 | collisionresult.Normal = new Vector3(contacts[i].normal.X, contacts[i].normal.Y, | 383 | collisionresult.Normal = new Vector3(contacts[i].normal.X, contacts[i].normal.Y, |
@@ -392,7 +393,7 @@ namespace OpenSim.Region.Physics.OdePlugin | |||
392 | { | 393 | { |
393 | ContactResult collisionresult = new ContactResult(); | 394 | ContactResult collisionresult = new ContactResult(); |
394 | 395 | ||
395 | collisionresult.ConsumerID = ((OdePrim)p2).m_localID; | 396 | collisionresult.ConsumerID = p2.LocalID; |
396 | collisionresult.Pos = new Vector3(contacts[i].pos.X, contacts[i].pos.Y, contacts[i].pos.Z); | 397 | collisionresult.Pos = new Vector3(contacts[i].pos.X, contacts[i].pos.Y, contacts[i].pos.Z); |
397 | collisionresult.Depth = contacts[i].depth; | 398 | collisionresult.Depth = contacts[i].depth; |
398 | collisionresult.Normal = new Vector3(contacts[i].normal.X, contacts[i].normal.Y, | 399 | collisionresult.Normal = new Vector3(contacts[i].normal.X, contacts[i].normal.Y, |