aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Physics
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region/Physics')
-rw-r--r--OpenSim/Region/Physics/Meshing/Meshmerizer.cs6
-rw-r--r--OpenSim/Region/Physics/OdePlugin/OdePlugin.cs4
2 files changed, 6 insertions, 4 deletions
diff --git a/OpenSim/Region/Physics/Meshing/Meshmerizer.cs b/OpenSim/Region/Physics/Meshing/Meshmerizer.cs
index 5008927..2e7ec15 100644
--- a/OpenSim/Region/Physics/Meshing/Meshmerizer.cs
+++ b/OpenSim/Region/Physics/Meshing/Meshmerizer.cs
@@ -579,7 +579,8 @@ namespace OpenSim.Region.Physics.Meshing
579 579
580 if (pathShearX != 0) 580 if (pathShearX != 0)
581 { 581 {
582 if (pathShearX > 50) { 582 if (pathShearX > 50)
583 {
583 // Complimentary byte. Negative values wrap around the byte. Positive values go up to 50 584 // Complimentary byte. Negative values wrap around the byte. Positive values go up to 50
584 extr.pushX = (((float)(256 - pathShearX) / 100) * -1f); 585 extr.pushX = (((float)(256 - pathShearX) / 100) * -1f);
585 // m_log.Warn("pushX: " + extr.pushX); 586 // m_log.Warn("pushX: " + extr.pushX);
@@ -593,7 +594,8 @@ namespace OpenSim.Region.Physics.Meshing
593 594
594 if (pathShearY != 0) 595 if (pathShearY != 0)
595 { 596 {
596 if (pathShearY > 50) { 597 if (pathShearY > 50)
598 {
597 // Complimentary byte. Negative values wrap around the byte. Positive values go up to 50 599 // Complimentary byte. Negative values wrap around the byte. Positive values go up to 50
598 extr.pushY = (((float)(256 - pathShearY) / 100) * -1f); 600 extr.pushY = (((float)(256 - pathShearY) / 100) * -1f);
599 //m_log.Warn("pushY: " + extr.pushY); 601 //m_log.Warn("pushY: " + extr.pushY);
diff --git a/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs b/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs
index a54523b..c2a1c8e 100644
--- a/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs
+++ b/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs
@@ -294,7 +294,7 @@ namespace OpenSim.Region.Physics.OdePlugin
294 internal void waitForSpaceUnlock(IntPtr space) 294 internal void waitForSpaceUnlock(IntPtr space)
295 { 295 {
296 //if (space != (IntPtr)0) 296 //if (space != (IntPtr)0)
297 //while (d.SpaceLockQuery(space)){ } // Wait and do nothing 297 //while (d.SpaceLockQuery(space)) { } // Wait and do nothing
298 } 298 }
299 299
300 /// <summary> 300 /// <summary>
@@ -952,7 +952,7 @@ namespace OpenSim.Region.Physics.OdePlugin
952 952
953 public void addCollisionEventReporting(PhysicsActor obj) 953 public void addCollisionEventReporting(PhysicsActor obj)
954 { 954 {
955 lock(_collisionEventPrim) 955 lock (_collisionEventPrim)
956 { 956 {
957 if (!_collisionEventPrim.Contains(obj)) 957 if (!_collisionEventPrim.Contains(obj))
958 _collisionEventPrim.Add(obj); 958 _collisionEventPrim.Add(obj);