diff options
| author | Justin Clark-Casey (justincc) | 2013-01-15 00:24:51 +0000 |
|---|---|---|
| committer | Justin Clark-Casey (justincc) | 2013-01-15 00:24:51 +0000 |
| commit | c846cefda97bd59b7707147d7ae1a520c9121127 (patch) | |
| tree | ee23e4b451087874a8149348e010a905817121f7 /OpenSim/Region/Physics/BulletSPlugin/BSShapeCollection.cs | |
| parent | refactor: Simplify ScriptInstance by retaining reference to SceneObjectPart i... (diff) | |
| parent | BulletSim: fix not moving physical objects below terrain to over terrain. (diff) | |
| download | opensim-SC_OLD-c846cefda97bd59b7707147d7ae1a520c9121127.zip opensim-SC_OLD-c846cefda97bd59b7707147d7ae1a520c9121127.tar.gz opensim-SC_OLD-c846cefda97bd59b7707147d7ae1a520c9121127.tar.bz2 opensim-SC_OLD-c846cefda97bd59b7707147d7ae1a520c9121127.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 | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSShapeCollection.cs b/OpenSim/Region/Physics/BulletSPlugin/BSShapeCollection.cs index f0c6b99..addab29 100755 --- a/OpenSim/Region/Physics/BulletSPlugin/BSShapeCollection.cs +++ b/OpenSim/Region/Physics/BulletSPlugin/BSShapeCollection.cs | |||
| @@ -906,7 +906,7 @@ public sealed class BSShapeCollection : IDisposable | |||
| 906 | } | 906 | } |
| 907 | } | 907 | } |
| 908 | 908 | ||
| 909 | // While we figure out the real problem, stick a simple native shape on the object. | 909 | // While we figure out the real problem, stick in a simple box for the object. |
| 910 | BulletShape fillinShape = | 910 | BulletShape fillinShape = |
| 911 | BuildPhysicalNativeShape(prim, BSPhysicsShapeType.SHAPE_BOX, FixedShapeKey.KEY_BOX); | 911 | BuildPhysicalNativeShape(prim, BSPhysicsShapeType.SHAPE_BOX, FixedShapeKey.KEY_BOX); |
| 912 | 912 | ||