diff options
author | onefang | 2019-09-11 16:36:50 +1000 |
---|---|---|
committer | onefang | 2019-09-11 16:36:50 +1000 |
commit | 50cd1ffd32f69228e566f2b0b89f86ea0d9fe489 (patch) | |
tree | 52f2ab0c04f1a5d7d6ac5dc872981b4b156447e7 /OpenSim/Region/PhysicsModules/POS/POSCharacter.cs | |
parent | Renamed branch to SledjChisl. (diff) | |
parent | Bump to release flavour, build 0. (diff) | |
download | opensim-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 '')
-rw-r--r-- | OpenSim/Region/PhysicsModules/POS/POSCharacter.cs | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/OpenSim/Region/PhysicsModules/POS/POSCharacter.cs b/OpenSim/Region/PhysicsModules/POS/POSCharacter.cs index 32469d9..341530e 100644 --- a/OpenSim/Region/PhysicsModules/POS/POSCharacter.cs +++ b/OpenSim/Region/PhysicsModules/POS/POSCharacter.cs | |||
@@ -248,7 +248,7 @@ namespace OpenSim.Region.PhysicsModule.POS | |||
248 | { | 248 | { |
249 | } | 249 | } |
250 | 250 | ||
251 | public override void LockAngularMotion(Vector3 axis) | 251 | public override void LockAngularMotion(byte axislocks) |
252 | { | 252 | { |
253 | } | 253 | } |
254 | 254 | ||
@@ -273,10 +273,10 @@ namespace OpenSim.Region.PhysicsModule.POS | |||
273 | set { return; } | 273 | set { return; } |
274 | } | 274 | } |
275 | 275 | ||
276 | public override bool PIDActive | 276 | public override bool PIDActive |
277 | { | 277 | { |
278 | get { return false; } | 278 | get { return false; } |
279 | set { return; } | 279 | set { return; } |
280 | } | 280 | } |
281 | 281 | ||
282 | public override float PIDTau | 282 | public override float PIDTau |
@@ -291,6 +291,7 @@ namespace OpenSim.Region.PhysicsModule.POS | |||
291 | 291 | ||
292 | public override bool PIDHoverActive | 292 | public override bool PIDHoverActive |
293 | { | 293 | { |
294 | get { return false; } | ||
294 | set { return; } | 295 | set { return; } |
295 | } | 296 | } |
296 | 297 | ||
@@ -303,7 +304,7 @@ namespace OpenSim.Region.PhysicsModule.POS | |||
303 | { | 304 | { |
304 | set { return; } | 305 | set { return; } |
305 | } | 306 | } |
306 | 307 | ||
307 | public override Quaternion APIDTarget | 308 | public override Quaternion APIDTarget |
308 | { | 309 | { |
309 | set { return; } | 310 | set { return; } |