diff options
| author | Diva Canto | 2014-11-21 08:54:30 -0800 |
|---|---|---|
| committer | Diva Canto | 2014-11-21 08:54:30 -0800 |
| commit | 8d3cb424a8730a0d0cdea42e513057c2c3fff679 (patch) | |
| tree | 611eb8cd3c3526e1f41058ed000e1c3f9f644cf8 /OpenSim/Region/Physics/BasicPhysicsPlugin | |
| parent | Cleanup extraneous comments from viewer support modules (diff) | |
| parent | LSL key should be implicitly cast to a boolean value (diff) | |
| download | opensim-SC-8d3cb424a8730a0d0cdea42e513057c2c3fff679.zip opensim-SC-8d3cb424a8730a0d0cdea42e513057c2c3fff679.tar.gz opensim-SC-8d3cb424a8730a0d0cdea42e513057c2c3fff679.tar.bz2 opensim-SC-8d3cb424a8730a0d0cdea42e513057c2c3fff679.tar.xz | |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Region/Physics/BasicPhysicsPlugin')
| -rw-r--r-- | OpenSim/Region/Physics/BasicPhysicsPlugin/BasicPhysicsActor.cs | 1 | ||||
| -rw-r--r-- | OpenSim/Region/Physics/BasicPhysicsPlugin/BasicPhysicsPrim.cs | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/OpenSim/Region/Physics/BasicPhysicsPlugin/BasicPhysicsActor.cs b/OpenSim/Region/Physics/BasicPhysicsPlugin/BasicPhysicsActor.cs index c1a37cc..43fba7b 100644 --- a/OpenSim/Region/Physics/BasicPhysicsPlugin/BasicPhysicsActor.cs +++ b/OpenSim/Region/Physics/BasicPhysicsPlugin/BasicPhysicsActor.cs | |||
| @@ -238,6 +238,7 @@ namespace OpenSim.Region.Physics.BasicPhysicsPlugin | |||
| 238 | 238 | ||
| 239 | public override bool PIDActive | 239 | public override bool PIDActive |
| 240 | { | 240 | { |
| 241 | get { return false; } | ||
| 241 | set { return; } | 242 | set { return; } |
| 242 | } | 243 | } |
| 243 | 244 | ||
diff --git a/OpenSim/Region/Physics/BasicPhysicsPlugin/BasicPhysicsPrim.cs b/OpenSim/Region/Physics/BasicPhysicsPlugin/BasicPhysicsPrim.cs index 47d7df3..dfe4c19 100644 --- a/OpenSim/Region/Physics/BasicPhysicsPlugin/BasicPhysicsPrim.cs +++ b/OpenSim/Region/Physics/BasicPhysicsPlugin/BasicPhysicsPrim.cs | |||
| @@ -251,6 +251,7 @@ namespace OpenSim.Region.Physics.BasicPhysicsPlugin | |||
| 251 | 251 | ||
| 252 | public override bool PIDActive | 252 | public override bool PIDActive |
| 253 | { | 253 | { |
| 254 | get { return false; } | ||
| 254 | set { return; } | 255 | set { return; } |
| 255 | } | 256 | } |
| 256 | 257 | ||