diff options
| author | Dan Lake | 2011-07-20 15:01:32 -0700 |
|---|---|---|
| committer | Dan Lake | 2011-07-20 15:01:32 -0700 |
| commit | 2c11f7fc38ba14e041ed0e648088d574dadaaffe (patch) | |
| tree | d593e3d1130e78ec74a11650d413f451a9a844da /OpenSim/Region/Physics/PhysXPlugin/PhysXScene.cs | |
| parent | Merge branch 'master' into bulletsim (diff) | |
| parent | Removed unused AddPrimShape methods in PhysicsScene caused by merge conflicts (diff) | |
| download | opensim-SC_OLD-2c11f7fc38ba14e041ed0e648088d574dadaaffe.zip opensim-SC_OLD-2c11f7fc38ba14e041ed0e648088d574dadaaffe.tar.gz opensim-SC_OLD-2c11f7fc38ba14e041ed0e648088d574dadaaffe.tar.bz2 opensim-SC_OLD-2c11f7fc38ba14e041ed0e648088d574dadaaffe.tar.xz | |
Merge branch 'master' into bulletsim
Diffstat (limited to 'OpenSim/Region/Physics/PhysXPlugin/PhysXScene.cs')
| -rw-r--r-- | OpenSim/Region/Physics/PhysXPlugin/PhysXScene.cs | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/OpenSim/Region/Physics/PhysXPlugin/PhysXScene.cs b/OpenSim/Region/Physics/PhysXPlugin/PhysXScene.cs index 4de4b01..beb3404 100644 --- a/OpenSim/Region/Physics/PhysXPlugin/PhysXScene.cs +++ b/OpenSim/Region/Physics/PhysXPlugin/PhysXScene.cs | |||
| @@ -108,13 +108,7 @@ namespace OpenSim.Region.Physics.PhysXPlugin | |||
| 108 | } | 108 | } |
| 109 | 109 | ||
| 110 | public override PhysicsActor AddPrimShape(string primName, PrimitiveBaseShape pbs, Vector3 position, | 110 | public override PhysicsActor AddPrimShape(string primName, PrimitiveBaseShape pbs, Vector3 position, |
| 111 | Vector3 size, Quaternion rotation) //To be removed | 111 | Vector3 size, Quaternion rotation, bool isPhysical, uint localid) |
| 112 | { | ||
| 113 | return AddPrimShape(primName, pbs, position, size, rotation, false); | ||
| 114 | } | ||
| 115 | |||
| 116 | public override PhysicsActor AddPrimShape(string primName, PrimitiveBaseShape pbs, Vector3 position, | ||
| 117 | Vector3 size, Quaternion rotation, bool isPhysical) | ||
| 118 | { | 112 | { |
| 119 | return AddPrim(position, size, rotation); | 113 | return AddPrim(position, size, rotation); |
| 120 | } | 114 | } |