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/POSPrim.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 'OpenSim/Region/PhysicsModules/POS/POSPrim.cs')
-rw-r--r-- | OpenSim/Region/PhysicsModules/POS/POSPrim.cs | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/OpenSim/Region/PhysicsModules/POS/POSPrim.cs b/OpenSim/Region/PhysicsModules/POS/POSPrim.cs index 8aae716..180885d 100644 --- a/OpenSim/Region/PhysicsModules/POS/POSPrim.cs +++ b/OpenSim/Region/PhysicsModules/POS/POSPrim.cs | |||
@@ -250,7 +250,7 @@ namespace OpenSim.Region.PhysicsModule.POS | |||
250 | { | 250 | { |
251 | } | 251 | } |
252 | 252 | ||
253 | public override void LockAngularMotion(Vector3 axis) | 253 | public override void LockAngularMotion(byte axislocks) |
254 | { | 254 | { |
255 | } | 255 | } |
256 | 256 | ||
@@ -286,6 +286,7 @@ namespace OpenSim.Region.PhysicsModule.POS | |||
286 | 286 | ||
287 | public override bool PIDHoverActive | 287 | public override bool PIDHoverActive |
288 | { | 288 | { |
289 | get { return false; } | ||
289 | set { return; } | 290 | set { return; } |
290 | } | 291 | } |
291 | 292 | ||
@@ -298,7 +299,7 @@ namespace OpenSim.Region.PhysicsModule.POS | |||
298 | { | 299 | { |
299 | set { return; } | 300 | set { return; } |
300 | } | 301 | } |
301 | 302 | ||
302 | public override Quaternion APIDTarget | 303 | public override Quaternion APIDTarget |
303 | { | 304 | { |
304 | set { return; } | 305 | set { return; } |