diff options
| author | Melanie | 2010-01-04 21:41:33 +0000 |
|---|---|---|
| committer | Melanie | 2010-01-04 21:41:33 +0000 |
| commit | 7f960cd5950129c8ae9ae8d0aa92efbf9ce3c0cc (patch) | |
| tree | badbb6fd767ff6127c28d339677febd9356d80b0 /OpenSim/Region/Physics/BasicPhysicsPlugin | |
| parent | Forgot to add these to the grid configs, so that logins work. (diff) | |
| parent | Finish conversion if XInventoryService (diff) | |
| download | opensim-SC_OLD-7f960cd5950129c8ae9ae8d0aa92efbf9ce3c0cc.zip opensim-SC_OLD-7f960cd5950129c8ae9ae8d0aa92efbf9ce3c0cc.tar.gz opensim-SC_OLD-7f960cd5950129c8ae9ae8d0aa92efbf9ce3c0cc.tar.bz2 opensim-SC_OLD-7f960cd5950129c8ae9ae8d0aa92efbf9ce3c0cc.tar.xz | |
Merge branch 'master' into presence-refactor
Diffstat (limited to 'OpenSim/Region/Physics/BasicPhysicsPlugin')
| -rw-r--r-- | OpenSim/Region/Physics/BasicPhysicsPlugin/BasicPhysicsActor.cs | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/OpenSim/Region/Physics/BasicPhysicsPlugin/BasicPhysicsActor.cs b/OpenSim/Region/Physics/BasicPhysicsPlugin/BasicPhysicsActor.cs index f411dd7..31366db 100644 --- a/OpenSim/Region/Physics/BasicPhysicsPlugin/BasicPhysicsActor.cs +++ b/OpenSim/Region/Physics/BasicPhysicsPlugin/BasicPhysicsActor.cs | |||
| @@ -305,22 +305,22 @@ namespace OpenSim.Region.Physics.BasicPhysicsPlugin | |||
| 305 | 305 | ||
| 306 | public override Quaternion APIDTarget | 306 | public override Quaternion APIDTarget |
| 307 | { | 307 | { |
| 308 | set { return; } | 308 | set { return; } |
| 309 | } | 309 | } |
| 310 | 310 | ||
| 311 | public override bool APIDActive | 311 | public override bool APIDActive |
| 312 | { | 312 | { |
| 313 | set { return; } | 313 | set { return; } |
| 314 | } | 314 | } |
| 315 | 315 | ||
| 316 | public override float APIDStrength | 316 | public override float APIDStrength |
| 317 | { | 317 | { |
| 318 | set { return; } | 318 | set { return; } |
| 319 | } | 319 | } |
| 320 | 320 | ||
| 321 | public override float APIDDamping | 321 | public override float APIDDamping |
| 322 | { | 322 | { |
| 323 | set { return; } | 323 | set { return; } |
| 324 | } | 324 | } |
| 325 | 325 | ||
| 326 | public override void SubscribeEvents(int ms) | 326 | public override void SubscribeEvents(int ms) |