diff options
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Physics/OdePlugin/OdePlugin.cs | 19 |
1 files changed, 18 insertions, 1 deletions
diff --git a/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs b/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs index 82b94db..f1db034 100644 --- a/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs +++ b/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs | |||
@@ -300,7 +300,12 @@ namespace OpenSim.Region.Physics.OdePlugin | |||
300 | 300 | ||
301 | 301 | ||
302 | public override PhysicsActor AddPrimShape(string primName, PrimitiveBaseShape pbs, PhysicsVector position, | 302 | public override PhysicsActor AddPrimShape(string primName, PrimitiveBaseShape pbs, PhysicsVector position, |
303 | PhysicsVector size, Quaternion rotation) | 303 | PhysicsVector size, Quaternion rotation) //To be removed |
304 | { | ||
305 | return this.AddPrimShape(primName, pbs, position, size, rotation, false); | ||
306 | } | ||
307 | public override PhysicsActor AddPrimShape(string primName, PrimitiveBaseShape pbs, PhysicsVector position, | ||
308 | PhysicsVector size, Quaternion rotation, bool isPhysical) | ||
304 | { | 309 | { |
305 | PhysicsActor result; | 310 | PhysicsActor result; |
306 | 311 | ||
@@ -510,6 +515,12 @@ namespace OpenSim.Region.Physics.OdePlugin | |||
510 | parent_scene.actor_name_map[Shell] = (PhysicsActor)this; | 515 | parent_scene.actor_name_map[Shell] = (PhysicsActor)this; |
511 | } | 516 | } |
512 | 517 | ||
518 | public override bool IsPhysical | ||
519 | { | ||
520 | get { return false; } | ||
521 | set { return; } | ||
522 | } | ||
523 | |||
513 | public override bool Flying | 524 | public override bool Flying |
514 | { | 525 | { |
515 | get { return flying; } | 526 | get { return flying; } |
@@ -758,6 +769,12 @@ namespace OpenSim.Region.Physics.OdePlugin | |||
758 | prim_geom = d.CreateTriMesh(parent_scene.space, _triMeshData, parent_scene.triCallback, null, null); | 769 | prim_geom = d.CreateTriMesh(parent_scene.space, _triMeshData, parent_scene.triCallback, null, null); |
759 | } | 770 | } |
760 | 771 | ||
772 | public override bool IsPhysical | ||
773 | { | ||
774 | get { return false; } | ||
775 | set { return; } | ||
776 | } | ||
777 | |||
761 | public override bool Flying | 778 | public override bool Flying |
762 | { | 779 | { |
763 | get { return false; //no flying prims for you | 780 | get { return false; //no flying prims for you |