diff options
| author | BlueWall | 2013-01-15 10:08:27 -0500 |
|---|---|---|
| committer | BlueWall | 2013-01-15 10:08:27 -0500 |
| commit | f54b398540698e6e09022fe77b6405624b532f5c (patch) | |
| tree | 74581e7176d06dd8e2bff43720a3033ccfe6df0e /OpenSim/Region/Physics/BulletSPlugin/BSShapeCollection.cs | |
| parent | Add Json-Rpc 2.0 To Registered Handlers (diff) | |
| parent | BulletSim: tweeks to improve hover. (diff) | |
| download | opensim-SC-f54b398540698e6e09022fe77b6405624b532f5c.zip opensim-SC-f54b398540698e6e09022fe77b6405624b532f5c.tar.gz opensim-SC-f54b398540698e6e09022fe77b6405624b532f5c.tar.bz2 opensim-SC-f54b398540698e6e09022fe77b6405624b532f5c.tar.xz | |
Merge branch 'master' of /home/opensim/var/repo/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 | ||