diff options
| author | UbitUmarov | 2017-01-05 19:32:57 +0000 |
|---|---|---|
| committer | UbitUmarov | 2017-01-05 19:32:57 +0000 |
| commit | 254b26a7d51143d4e08229fa0b0fceabd76a41d0 (patch) | |
| tree | 8ed65006e5dc04e69ceba67e31075a9e505e64f6 /OpenSim/Region/PhysicsModules/POS/POSCharacter.cs | |
| parent | Merge branch 'master' into httptests (diff) | |
| parent | Massive tab and trailing space cleanup (diff) | |
| download | opensim-SC-254b26a7d51143d4e08229fa0b0fceabd76a41d0.zip opensim-SC-254b26a7d51143d4e08229fa0b0fceabd76a41d0.tar.gz opensim-SC-254b26a7d51143d4e08229fa0b0fceabd76a41d0.tar.bz2 opensim-SC-254b26a7d51143d4e08229fa0b0fceabd76a41d0.tar.xz | |
fix merge
Diffstat (limited to '')
| -rw-r--r-- | OpenSim/Region/PhysicsModules/POS/POSCharacter.cs | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/OpenSim/Region/PhysicsModules/POS/POSCharacter.cs b/OpenSim/Region/PhysicsModules/POS/POSCharacter.cs index 28d2b53..341530e 100644 --- a/OpenSim/Region/PhysicsModules/POS/POSCharacter.cs +++ b/OpenSim/Region/PhysicsModules/POS/POSCharacter.cs | |||
| @@ -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 |
| @@ -304,7 +304,7 @@ namespace OpenSim.Region.PhysicsModule.POS | |||
| 304 | { | 304 | { |
| 305 | set { return; } | 305 | set { return; } |
| 306 | } | 306 | } |
| 307 | 307 | ||
| 308 | public override Quaternion APIDTarget | 308 | public override Quaternion APIDTarget |
| 309 | { | 309 | { |
| 310 | set { return; } | 310 | set { return; } |