diff options
Diffstat (limited to '')
3 files changed, 5 insertions, 3 deletions
diff --git a/OpenSim/Region/PhysicsModules/BasicPhysics/BasicPhysicsActor.cs b/OpenSim/Region/PhysicsModules/BasicPhysics/BasicPhysicsActor.cs index e7b30ba..3944047 100644 --- a/OpenSim/Region/PhysicsModules/BasicPhysics/BasicPhysicsActor.cs +++ b/OpenSim/Region/PhysicsModules/BasicPhysics/BasicPhysicsActor.cs | |||
@@ -211,7 +211,7 @@ namespace OpenSim.Region.PhysicsModule.BasicPhysics | |||
211 | { | 211 | { |
212 | } | 212 | } |
213 | 213 | ||
214 | public override void LockAngularMotion(Vector3 axis) | 214 | public override void LockAngularMotion(byte axislocks) |
215 | { | 215 | { |
216 | } | 216 | } |
217 | 217 | ||
@@ -254,6 +254,7 @@ namespace OpenSim.Region.PhysicsModule.BasicPhysics | |||
254 | 254 | ||
255 | public override bool PIDHoverActive | 255 | public override bool PIDHoverActive |
256 | { | 256 | { |
257 | get { return false; } | ||
257 | set { return; } | 258 | set { return; } |
258 | } | 259 | } |
259 | 260 | ||
diff --git a/OpenSim/Region/PhysicsModules/BasicPhysics/BasicPhysicsPrim.cs b/OpenSim/Region/PhysicsModules/BasicPhysics/BasicPhysicsPrim.cs index 5383f1b..d2cd028 100644 --- a/OpenSim/Region/PhysicsModules/BasicPhysics/BasicPhysicsPrim.cs +++ b/OpenSim/Region/PhysicsModules/BasicPhysics/BasicPhysicsPrim.cs | |||
@@ -224,7 +224,7 @@ namespace OpenSim.Region.PhysicsModule.BasicPhysics | |||
224 | { | 224 | { |
225 | } | 225 | } |
226 | 226 | ||
227 | public override void LockAngularMotion(Vector3 axis) | 227 | public override void LockAngularMotion(byte axislocks) |
228 | { | 228 | { |
229 | } | 229 | } |
230 | 230 | ||
@@ -267,6 +267,7 @@ namespace OpenSim.Region.PhysicsModule.BasicPhysics | |||
267 | 267 | ||
268 | public override bool PIDHoverActive | 268 | public override bool PIDHoverActive |
269 | { | 269 | { |
270 | get { return false; } | ||
270 | set { return; } | 271 | set { return; } |
271 | } | 272 | } |
272 | 273 | ||
diff --git a/OpenSim/Region/PhysicsModules/BasicPhysics/BasicPhysicsScene.cs b/OpenSim/Region/PhysicsModules/BasicPhysics/BasicPhysicsScene.cs index 20b337a..ac2c1f3 100644 --- a/OpenSim/Region/PhysicsModules/BasicPhysics/BasicPhysicsScene.cs +++ b/OpenSim/Region/PhysicsModules/BasicPhysics/BasicPhysicsScene.cs | |||
@@ -220,7 +220,7 @@ namespace OpenSim.Region.PhysicsModule.BasicPhysics | |||
220 | actor.Velocity = actorVelocity; | 220 | actor.Velocity = actorVelocity; |
221 | } | 221 | } |
222 | 222 | ||
223 | return fps; | 223 | return 1.0f; |
224 | } | 224 | } |
225 | 225 | ||
226 | public override void GetResults() | 226 | public override void GetResults() |