diff options
Diffstat (limited to 'OpenSim/Region/Physics/PhysXPlugin')
-rw-r--r-- | OpenSim/Region/Physics/PhysXPlugin/PhysXPlugin.cs | 19 |
1 files changed, 18 insertions, 1 deletions
diff --git a/OpenSim/Region/Physics/PhysXPlugin/PhysXPlugin.cs b/OpenSim/Region/Physics/PhysXPlugin/PhysXPlugin.cs index cad66d7..7a43a0a 100644 --- a/OpenSim/Region/Physics/PhysXPlugin/PhysXPlugin.cs +++ b/OpenSim/Region/Physics/PhysXPlugin/PhysXPlugin.cs | |||
@@ -120,7 +120,12 @@ namespace OpenSim.Region.Physics.PhysXPlugin | |||
120 | } | 120 | } |
121 | 121 | ||
122 | public override PhysicsActor AddPrimShape(string primName, PrimitiveBaseShape pbs, PhysicsVector position, | 122 | public override PhysicsActor AddPrimShape(string primName, PrimitiveBaseShape pbs, PhysicsVector position, |
123 | PhysicsVector size, Quaternion rotation) | 123 | PhysicsVector size, Quaternion rotation) //To be removed |
124 | { | ||
125 | return this.AddPrimShape(primName, pbs, position, size, rotation, false); | ||
126 | } | ||
127 | public override PhysicsActor AddPrimShape(string primName, PrimitiveBaseShape pbs, PhysicsVector position, | ||
128 | PhysicsVector size, Quaternion rotation, bool isPhysical) | ||
124 | { | 129 | { |
125 | return AddPrim(position, size, rotation); | 130 | return AddPrim(position, size, rotation); |
126 | } | 131 | } |
@@ -193,6 +198,12 @@ namespace OpenSim.Region.Physics.PhysXPlugin | |||
193 | _character = character; | 198 | _character = character; |
194 | } | 199 | } |
195 | 200 | ||
201 | public override bool IsPhysical | ||
202 | { | ||
203 | get { return false; } | ||
204 | set { return; } | ||
205 | } | ||
206 | |||
196 | public override bool Flying | 207 | public override bool Flying |
197 | { | 208 | { |
198 | get { return flying; } | 209 | get { return flying; } |
@@ -305,6 +316,12 @@ namespace OpenSim.Region.Physics.PhysXPlugin | |||
305 | _prim = prim; | 316 | _prim = prim; |
306 | } | 317 | } |
307 | 318 | ||
319 | public override bool IsPhysical | ||
320 | { | ||
321 | get { return false; } | ||
322 | set { return; } | ||
323 | } | ||
324 | |||
308 | public override bool Flying | 325 | public override bool Flying |
309 | { | 326 | { |
310 | get { return false; //no flying prims for you | 327 | get { return false; //no flying prims for you |