diff options
Diffstat (limited to '')
6 files changed, 9 insertions, 11 deletions
diff --git a/OpenSim/Region/Physics/BulletDotNETPlugin/BulletDotNETScene.cs b/OpenSim/Region/Physics/BulletDotNETPlugin/BulletDotNETScene.cs index f006cf1..58c2a15 100644 --- a/OpenSim/Region/Physics/BulletDotNETPlugin/BulletDotNETScene.cs +++ b/OpenSim/Region/Physics/BulletDotNETPlugin/BulletDotNETScene.cs | |||
@@ -459,7 +459,7 @@ namespace OpenSim.Region.Physics.BulletDotNETPlugin | |||
459 | { | 459 | { |
460 | lock (m_prims) | 460 | lock (m_prims) |
461 | { | 461 | { |
462 | foreach ( BulletDotNETPrim prim in m_prims) | 462 | foreach (BulletDotNETPrim prim in m_prims) |
463 | { | 463 | { |
464 | if (prim.Body != null) | 464 | if (prim.Body != null) |
465 | m_world.removeRigidBody(prim.Body); | 465 | m_world.removeRigidBody(prim.Body); |
diff --git a/OpenSim/Region/Physics/Meshing/Meshmerizer.cs b/OpenSim/Region/Physics/Meshing/Meshmerizer.cs index 253f451..06cfcdd 100644 --- a/OpenSim/Region/Physics/Meshing/Meshmerizer.cs +++ b/OpenSim/Region/Physics/Meshing/Meshmerizer.cs | |||
@@ -429,8 +429,7 @@ namespace OpenSim.Region.Physics.Meshing | |||
429 | { | 429 | { |
430 | #if SPAM | 430 | #if SPAM |
431 | m_log.Debug("Meshmerizer: prim " + primName + " has a size of " + size.ToString() + " which is below threshold of " + | 431 | m_log.Debug("Meshmerizer: prim " + primName + " has a size of " + size.ToString() + " which is below threshold of " + |
432 | 432 | minSizeForComplexMesh.ToString() + " - creating simple bounding box"); | |
433 | minSizeForComplexMesh.ToString() + " - creating simple bounding box" ); | ||
434 | #endif | 433 | #endif |
435 | mesh = CreateBoundingBoxMesh(mesh); | 434 | mesh = CreateBoundingBoxMesh(mesh); |
436 | mesh.DumpRaw(baseDir, primName, "Z extruded"); | 435 | mesh.DumpRaw(baseDir, primName, "Z extruded"); |
@@ -443,6 +442,5 @@ minSizeForComplexMesh.ToString() + " - creating simple bounding box" ); | |||
443 | 442 | ||
444 | return mesh; | 443 | return mesh; |
445 | } | 444 | } |
446 | |||
447 | } | 445 | } |
448 | } | 446 | } |
diff --git a/OpenSim/Region/Physics/OdePlugin/ODECharacter.cs b/OpenSim/Region/Physics/OdePlugin/ODECharacter.cs index 6759fd9..3f0d6c1 100644 --- a/OpenSim/Region/Physics/OdePlugin/ODECharacter.cs +++ b/OpenSim/Region/Physics/OdePlugin/ODECharacter.cs | |||
@@ -1116,7 +1116,7 @@ namespace OpenSim.Region.Physics.OdePlugin | |||
1116 | m_log.Warn("[PHYSICS]: re-creating the following avatar ODE data, even though it already exists - " | 1116 | m_log.Warn("[PHYSICS]: re-creating the following avatar ODE data, even though it already exists - " |
1117 | + (Shell!=IntPtr.Zero ? "Shell ":"") | 1117 | + (Shell!=IntPtr.Zero ? "Shell ":"") |
1118 | + (Body!=IntPtr.Zero ? "Body ":"") | 1118 | + (Body!=IntPtr.Zero ? "Body ":"") |
1119 | + (Amotor!=IntPtr.Zero ? "Amotor ":"") ); | 1119 | + (Amotor!=IntPtr.Zero ? "Amotor ":"")); |
1120 | } | 1120 | } |
1121 | AvatarGeomAndBodyCreation(_position.X, _position.Y, _position.Z, m_tensor); | 1121 | AvatarGeomAndBodyCreation(_position.X, _position.Y, _position.Z, m_tensor); |
1122 | 1122 | ||
@@ -1182,7 +1182,7 @@ namespace OpenSim.Region.Physics.OdePlugin | |||
1182 | m_log.Warn("[PHYSICS]: trying to change capsule size, but the following ODE data is missing - " | 1182 | m_log.Warn("[PHYSICS]: trying to change capsule size, but the following ODE data is missing - " |
1183 | + (Shell==IntPtr.Zero ? "Shell ":"") | 1183 | + (Shell==IntPtr.Zero ? "Shell ":"") |
1184 | + (Body==IntPtr.Zero ? "Body ":"") | 1184 | + (Body==IntPtr.Zero ? "Body ":"") |
1185 | + (Amotor==IntPtr.Zero ? "Amotor ":"") ); | 1185 | + (Amotor==IntPtr.Zero ? "Amotor ":"")); |
1186 | } | 1186 | } |
1187 | } | 1187 | } |
1188 | 1188 | ||
diff --git a/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs b/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs index e6f45c8..d8d3b68 100644 --- a/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs +++ b/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs | |||
@@ -2593,7 +2593,7 @@ namespace OpenSim.Region.Physics.OdePlugin | |||
2593 | if ((Math.Abs(m_lastposition.X - l_position.X) < 0.02) | 2593 | if ((Math.Abs(m_lastposition.X - l_position.X) < 0.02) |
2594 | && (Math.Abs(m_lastposition.Y - l_position.Y) < 0.02) | 2594 | && (Math.Abs(m_lastposition.Y - l_position.Y) < 0.02) |
2595 | && (Math.Abs(m_lastposition.Z - l_position.Z) < 0.02) | 2595 | && (Math.Abs(m_lastposition.Z - l_position.Z) < 0.02) |
2596 | && (1.0 - Math.Abs(Quaternion.Dot(m_lastorientation, l_orientation)) < 0.01 )) | 2596 | && (1.0 - Math.Abs(Quaternion.Dot(m_lastorientation, l_orientation)) < 0.01)) |
2597 | { | 2597 | { |
2598 | _zeroFlag = true; | 2598 | _zeroFlag = true; |
2599 | m_throttleUpdates = false; | 2599 | m_throttleUpdates = false; |
@@ -2981,7 +2981,7 @@ namespace OpenSim.Region.Physics.OdePlugin | |||
2981 | Matrix4 transposeMatrix = new Matrix4(); | 2981 | Matrix4 transposeMatrix = new Matrix4(); |
2982 | for (int i = 0; i < 4; i++) | 2982 | for (int i = 0; i < 4; i++) |
2983 | for (int j = 0; j < 4; j++) | 2983 | for (int j = 0; j < 4; j++) |
2984 | Matrix4SetValue( ref transposeMatrix, i, j, pMat[j, i]); | 2984 | Matrix4SetValue(ref transposeMatrix, i, j, pMat[j, i]); |
2985 | return transposeMatrix; | 2985 | return transposeMatrix; |
2986 | } | 2986 | } |
2987 | 2987 | ||
diff --git a/OpenSim/Region/Physics/OdePlugin/ODEVehicleSettings.cs b/OpenSim/Region/Physics/OdePlugin/ODEVehicleSettings.cs index e6b84ae..063b14f 100644 --- a/OpenSim/Region/Physics/OdePlugin/ODEVehicleSettings.cs +++ b/OpenSim/Region/Physics/OdePlugin/ODEVehicleSettings.cs | |||
@@ -234,7 +234,7 @@ namespace OpenSim.Region.Physics.OdePlugin | |||
234 | SetDefaultsForType(pType); | 234 | SetDefaultsForType(pType); |
235 | Reset(); | 235 | Reset(); |
236 | } | 236 | } |
237 | else if (m_type != Vehicle.TYPE_NONE && pType != Vehicle.TYPE_NONE ) | 237 | else if (m_type != Vehicle.TYPE_NONE && pType != Vehicle.TYPE_NONE) |
238 | { | 238 | { |
239 | // Set properties | 239 | // Set properties |
240 | SetDefaultsForType(pType); | 240 | SetDefaultsForType(pType); |
@@ -408,7 +408,7 @@ namespace OpenSim.Region.Physics.OdePlugin | |||
408 | // m_bankingMix = 0.8f; | 408 | // m_bankingMix = 0.8f; |
409 | // m_bankingTimescale = 1; | 409 | // m_bankingTimescale = 1; |
410 | // m_referenceFrame = Quaternion.Identity; | 410 | // m_referenceFrame = Quaternion.Identity; |
411 | m_flags &= ~( VehicleFlag.HOVER_TERRAIN_ONLY | VehicleFlag.LIMIT_ROLL_ONLY | VehicleFlag.HOVER_GLOBAL_HEIGHT); | 411 | m_flags &= ~(VehicleFlag.HOVER_TERRAIN_ONLY | VehicleFlag.LIMIT_ROLL_ONLY | VehicleFlag.HOVER_GLOBAL_HEIGHT); |
412 | m_flags |= (VehicleFlag.NO_DEFLECTION_UP | VehicleFlag.HOVER_WATER_ONLY | VehicleFlag.HOVER_UP_ONLY | | 412 | m_flags |= (VehicleFlag.NO_DEFLECTION_UP | VehicleFlag.HOVER_WATER_ONLY | VehicleFlag.HOVER_UP_ONLY | |
413 | VehicleFlag.LIMIT_MOTOR_UP); | 413 | VehicleFlag.LIMIT_MOTOR_UP); |
414 | break; | 414 | break; |
diff --git a/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs b/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs index 713269c..60ac724 100644 --- a/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs +++ b/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs | |||
@@ -3261,7 +3261,7 @@ namespace OpenSim.Region.Physics.OdePlugin | |||
3261 | d.GeomHeightfieldDataBuildSingle(HeightmapData, _heightmap, 0, heightmapWidth, heightmapHeight, | 3261 | d.GeomHeightfieldDataBuildSingle(HeightmapData, _heightmap, 0, heightmapWidth, heightmapHeight, |
3262 | (int) heightmapWidthSamples, (int) heightmapHeightSamples, scale, | 3262 | (int) heightmapWidthSamples, (int) heightmapHeightSamples, scale, |
3263 | offset, thickness, wrap); | 3263 | offset, thickness, wrap); |
3264 | d.GeomHeightfieldDataSetBounds(HeightmapData, hfmin - 1 , hfmax + 1 ); | 3264 | d.GeomHeightfieldDataSetBounds(HeightmapData, hfmin - 1 , hfmax + 1); |
3265 | LandGeom = d.CreateHeightfield(space, HeightmapData, 1); | 3265 | LandGeom = d.CreateHeightfield(space, HeightmapData, 1); |
3266 | if (LandGeom != IntPtr.Zero) | 3266 | if (LandGeom != IntPtr.Zero) |
3267 | { | 3267 | { |