diff options
| author | Melanie | 2013-01-02 11:52:37 +0000 |
|---|---|---|
| committer | Melanie | 2013-01-02 11:52:37 +0000 |
| commit | 7943c8d11cbcac3ab16fb347d0c4116adc6437a5 (patch) | |
| tree | a8f099569905001bdedf144a77fd7b9191aa6427 /OpenSim/Region/Physics/BulletSNPlugin | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | BulletSim: add parameter to have Bullet output performance statistics (diff) | |
| download | opensim-SC-7943c8d11cbcac3ab16fb347d0c4116adc6437a5.zip opensim-SC-7943c8d11cbcac3ab16fb347d0c4116adc6437a5.tar.gz opensim-SC-7943c8d11cbcac3ab16fb347d0c4116adc6437a5.tar.bz2 opensim-SC-7943c8d11cbcac3ab16fb347d0c4116adc6437a5.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
Diffstat (limited to 'OpenSim/Region/Physics/BulletSNPlugin')
| -rw-r--r-- | OpenSim/Region/Physics/BulletSNPlugin/BSPrim.cs | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/OpenSim/Region/Physics/BulletSNPlugin/BSPrim.cs b/OpenSim/Region/Physics/BulletSNPlugin/BSPrim.cs index 9c4ba30..aadb5b2 100644 --- a/OpenSim/Region/Physics/BulletSNPlugin/BSPrim.cs +++ b/OpenSim/Region/Physics/BulletSNPlugin/BSPrim.cs | |||
| @@ -111,10 +111,6 @@ public sealed class BSPrim : BSPhysObject | |||
| 111 | 111 | ||
| 112 | _mass = CalculateMass(); | 112 | _mass = CalculateMass(); |
| 113 | 113 | ||
| 114 | // No body or shape yet | ||
| 115 | PhysBody = new BulletBody(LocalID); | ||
| 116 | PhysShape = new BulletShape(); | ||
| 117 | |||
| 118 | Linkset.Refresh(this); | 114 | Linkset.Refresh(this); |
| 119 | 115 | ||
| 120 | DetailLog("{0},BSPrim.constructor,call", LocalID); | 116 | DetailLog("{0},BSPrim.constructor,call", LocalID); |