diff options
| author | Melanie | 2012-11-19 22:53:03 +0000 |
|---|---|---|
| committer | Melanie | 2012-11-19 22:53:03 +0000 |
| commit | 9f2d232c71d76a7e652f7dbae05051e62ab558d7 (patch) | |
| tree | 84f6d25a5f17d88984b23fe8e1c72a95f9a3b00e /OpenSim/Region/Physics/BulletSPlugin/BSPhysObject.cs | |
| parent | Merge branch 'avination' into careminster (diff) | |
| parent | BulletSim: Use base class constructors for initialization of BSShape and othe... (diff) | |
| download | opensim-SC-9f2d232c71d76a7e652f7dbae05051e62ab558d7.zip opensim-SC-9f2d232c71d76a7e652f7dbae05051e62ab558d7.tar.gz opensim-SC-9f2d232c71d76a7e652f7dbae05051e62ab558d7.tar.bz2 opensim-SC-9f2d232c71d76a7e652f7dbae05051e62ab558d7.tar.xz | |
Merge branch 'master' into careminster
Diffstat (limited to 'OpenSim/Region/Physics/BulletSPlugin/BSPhysObject.cs')
| -rwxr-xr-x | OpenSim/Region/Physics/BulletSPlugin/BSPhysObject.cs | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSPhysObject.cs b/OpenSim/Region/Physics/BulletSPlugin/BSPhysObject.cs index e803072..991e5b1 100755 --- a/OpenSim/Region/Physics/BulletSPlugin/BSPhysObject.cs +++ b/OpenSim/Region/Physics/BulletSPlugin/BSPhysObject.cs | |||
| @@ -47,7 +47,10 @@ namespace OpenSim.Region.Physics.BulletSPlugin | |||
| 47 | */ | 47 | */ |
| 48 | public abstract class BSPhysObject : PhysicsActor | 48 | public abstract class BSPhysObject : PhysicsActor |
| 49 | { | 49 | { |
| 50 | protected void BaseInitialize(BSScene parentScene, uint localID, string name, string typeName) | 50 | protected BSPhysObject() |
| 51 | { | ||
| 52 | } | ||
| 53 | protected BSPhysObject(BSScene parentScene, uint localID, string name, string typeName) | ||
| 51 | { | 54 | { |
| 52 | PhysicsScene = parentScene; | 55 | PhysicsScene = parentScene; |
| 53 | LocalID = localID; | 56 | LocalID = localID; |