aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/PhysicsModules/BasicPhysics/BasicPhysicsPrim.cs
diff options
context:
space:
mode:
authoronefang2019-09-11 16:36:50 +1000
committeronefang2019-09-11 16:36:50 +1000
commit50cd1ffd32f69228e566f2b0b89f86ea0d9fe489 (patch)
tree52f2ab0c04f1a5d7d6ac5dc872981b4b156447e7 /OpenSim/Region/PhysicsModules/BasicPhysics/BasicPhysicsPrim.cs
parentRenamed branch to SledjChisl. (diff)
parentBump to release flavour, build 0. (diff)
downloadopensim-SC_OLD-50cd1ffd32f69228e566f2b0b89f86ea0d9fe489.zip
opensim-SC_OLD-50cd1ffd32f69228e566f2b0b89f86ea0d9fe489.tar.gz
opensim-SC_OLD-50cd1ffd32f69228e566f2b0b89f86ea0d9fe489.tar.bz2
opensim-SC_OLD-50cd1ffd32f69228e566f2b0b89f86ea0d9fe489.tar.xz
Merge branch 'SledjChisl'
Diffstat (limited to 'OpenSim/Region/PhysicsModules/BasicPhysics/BasicPhysicsPrim.cs')
-rw-r--r--OpenSim/Region/PhysicsModules/BasicPhysics/BasicPhysicsPrim.cs19
1 files changed, 10 insertions, 9 deletions
diff --git a/OpenSim/Region/PhysicsModules/BasicPhysics/BasicPhysicsPrim.cs b/OpenSim/Region/PhysicsModules/BasicPhysics/BasicPhysicsPrim.cs
index 5383f1b..58c2581 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
@@ -280,23 +281,23 @@ namespace OpenSim.Region.PhysicsModule.BasicPhysics
280 set { return; } 281 set { return; }
281 } 282 }
282 283
283 public override Quaternion APIDTarget 284 public override Quaternion APIDTarget
284 { 285 {
285 set { return; } 286 set { return; }
286 } 287 }
287 288
288 public override bool APIDActive 289 public override bool APIDActive
289 { 290 {
290 set { return; } 291 set { return; }
291 } 292 }
292 293
293 public override float APIDStrength 294 public override float APIDStrength
294 { 295 {
295 set { return; } 296 set { return; }
296 } 297 }
297 298
298 public override float APIDDamping 299 public override float APIDDamping
299 { 300 {
300 set { return; } 301 set { return; }
301 } 302 }
302 303