diff options
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/PhysicsModules/BasicPhysics/BasicPhysicsActor.cs (renamed from OpenSim/Region/Physics/BasicPhysicsPlugin/BasicPhysicsActor.cs) | 16 |
1 files changed, 4 insertions, 12 deletions
diff --git a/OpenSim/Region/Physics/BasicPhysicsPlugin/BasicPhysicsActor.cs b/OpenSim/Region/PhysicsModules/BasicPhysics/BasicPhysicsActor.cs index e43136a..e7b30ba 100644 --- a/OpenSim/Region/Physics/BasicPhysicsPlugin/BasicPhysicsActor.cs +++ b/OpenSim/Region/PhysicsModules/BasicPhysics/BasicPhysicsActor.cs | |||
@@ -30,14 +30,12 @@ using System.Collections.Generic; | |||
30 | using Nini.Config; | 30 | using Nini.Config; |
31 | using OpenMetaverse; | 31 | using OpenMetaverse; |
32 | using OpenSim.Framework; | 32 | using OpenSim.Framework; |
33 | using OpenSim.Region.Physics.Manager; | 33 | using OpenSim.Region.PhysicsModules.SharedBase; |
34 | 34 | ||
35 | namespace OpenSim.Region.Physics.BasicPhysicsPlugin | 35 | namespace OpenSim.Region.PhysicsModule.BasicPhysics |
36 | { | 36 | { |
37 | public class BasicActor : PhysicsActor | 37 | public class BasicActor : PhysicsActor |
38 | { | 38 | { |
39 | private Vector3 _size; | ||
40 | |||
41 | public BasicActor(Vector3 size) | 39 | public BasicActor(Vector3 size) |
42 | { | 40 | { |
43 | Size = size; | 41 | Size = size; |
@@ -118,14 +116,7 @@ namespace OpenSim.Region.Physics.BasicPhysicsPlugin | |||
118 | 116 | ||
119 | public override Vector3 Position { get; set; } | 117 | public override Vector3 Position { get; set; } |
120 | 118 | ||
121 | public override Vector3 Size | 119 | public override Vector3 Size { get; set; } |
122 | { | ||
123 | get { return _size; } | ||
124 | set { | ||
125 | _size = value; | ||
126 | _size.Z = _size.Z / 2.0f; | ||
127 | } | ||
128 | } | ||
129 | 120 | ||
130 | public override PrimitiveBaseShape Shape | 121 | public override PrimitiveBaseShape Shape |
131 | { | 122 | { |
@@ -247,6 +238,7 @@ namespace OpenSim.Region.Physics.BasicPhysicsPlugin | |||
247 | 238 | ||
248 | public override bool PIDActive | 239 | public override bool PIDActive |
249 | { | 240 | { |
241 | get { return false; } | ||
250 | set { return; } | 242 | set { return; } |
251 | } | 243 | } |
252 | 244 | ||