diff options
author | BlueWall | 2012-12-03 20:17:00 -0500 |
---|---|---|
committer | BlueWall | 2012-12-03 20:17:00 -0500 |
commit | 0c7d6adef158d5cb25d8eb60287c5cb0cceaa953 (patch) | |
tree | f766959f3442b78aa9202a4f61cf127508245345 /OpenSim/Region/Physics/BulletSPlugin/BSShapeCollection.cs | |
parent | XmlRpcGridRouter (diff) | |
parent | BulletSim: Reduce idle region physics overhead where there are MANY (diff) | |
download | opensim-SC_OLD-0c7d6adef158d5cb25d8eb60287c5cb0cceaa953.zip opensim-SC_OLD-0c7d6adef158d5cb25d8eb60287c5cb0cceaa953.tar.gz opensim-SC_OLD-0c7d6adef158d5cb25d8eb60287c5cb0cceaa953.tar.bz2 opensim-SC_OLD-0c7d6adef158d5cb25d8eb60287c5cb0cceaa953.tar.xz |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Region/Physics/BulletSPlugin/BSShapeCollection.cs')
-rwxr-xr-x | OpenSim/Region/Physics/BulletSPlugin/BSShapeCollection.cs | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSShapeCollection.cs b/OpenSim/Region/Physics/BulletSPlugin/BSShapeCollection.cs index 892c34b..b94dcf6 100755 --- a/OpenSim/Region/Physics/BulletSPlugin/BSShapeCollection.cs +++ b/OpenSim/Region/Physics/BulletSPlugin/BSShapeCollection.cs | |||
@@ -620,8 +620,7 @@ public sealed class BSShapeCollection : IDisposable | |||
620 | } | 620 | } |
621 | else | 621 | else |
622 | { | 622 | { |
623 | // Pass false for physicalness as this creates some sort of bounding box which we don't need | 623 | meshData = PhysicsScene.mesher.CreateMesh(objName, pbs, size, lod, true, false); |
624 | meshData = PhysicsScene.mesher.CreateMesh(objName, pbs, size, lod, false); | ||
625 | 624 | ||
626 | if (meshData != null) | 625 | if (meshData != null) |
627 | { | 626 | { |
@@ -694,8 +693,8 @@ public sealed class BSShapeCollection : IDisposable | |||
694 | else | 693 | else |
695 | { | 694 | { |
696 | // Build a new hull in the physical world | 695 | // Build a new hull in the physical world |
697 | // Pass false for physicalness as this creates some sort of bounding box which we don't need | 696 | // Pass true for physicalness as this creates some sort of bounding box which we don't need |
698 | IMesh meshData = PhysicsScene.mesher.CreateMesh(objName, pbs, size, lod, false); | 697 | IMesh meshData = PhysicsScene.mesher.CreateMesh(objName, pbs, size, lod, true, false); |
699 | if (meshData != null) | 698 | if (meshData != null) |
700 | { | 699 | { |
701 | 700 | ||