diff options
| author | Melanie | 2010-01-21 23:48:11 +0000 |
|---|---|---|
| committer | Melanie | 2010-01-21 23:48:11 +0000 |
| commit | d2e17f4ffb3bbd4e377152bef097d47d481c6c5c (patch) | |
| tree | 82603908ff006d9c61d28c56ea8b5296933223fc /OpenSim/Region/Physics/BulletDotNETPlugin | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | Add glue for llSetVehicleFlags(), llRemoveVehicleFlags(). ChODE: Add associat... (diff) | |
| download | opensim-SC-d2e17f4ffb3bbd4e377152bef097d47d481c6c5c.zip opensim-SC-d2e17f4ffb3bbd4e377152bef097d47d481c6c5c.tar.gz opensim-SC-d2e17f4ffb3bbd4e377152bef097d47d481c6c5c.tar.bz2 opensim-SC-d2e17f4ffb3bbd4e377152bef097d47d481c6c5c.tar.xz | |
Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into careminster
Diffstat (limited to 'OpenSim/Region/Physics/BulletDotNETPlugin')
| -rw-r--r-- | OpenSim/Region/Physics/BulletDotNETPlugin/BulletDotNETCharacter.cs | 10 | ||||
| -rw-r--r-- | OpenSim/Region/Physics/BulletDotNETPlugin/BulletDotNETPrim.cs | 10 |
2 files changed, 20 insertions, 0 deletions
diff --git a/OpenSim/Region/Physics/BulletDotNETPlugin/BulletDotNETCharacter.cs b/OpenSim/Region/Physics/BulletDotNETPlugin/BulletDotNETCharacter.cs index a3344dd..120d040 100644 --- a/OpenSim/Region/Physics/BulletDotNETPlugin/BulletDotNETCharacter.cs +++ b/OpenSim/Region/Physics/BulletDotNETPlugin/BulletDotNETCharacter.cs | |||
| @@ -361,7 +361,17 @@ namespace OpenSim.Region.Physics.BulletDotNETPlugin | |||
| 361 | { | 361 | { |
| 362 | 362 | ||
| 363 | } | 363 | } |
| 364 | |||
| 365 | public override void VehicleFlagsSet(int flags) | ||
| 366 | { | ||
| 367 | |||
| 368 | } | ||
| 369 | |||
| 370 | public override void VehicleFlagsRemove(int flags) | ||
| 371 | { | ||
| 364 | 372 | ||
| 373 | } | ||
| 374 | |||
| 365 | public override void SetVolumeDetect(int param) | 375 | public override void SetVolumeDetect(int param) |
| 366 | { | 376 | { |
| 367 | 377 | ||
diff --git a/OpenSim/Region/Physics/BulletDotNETPlugin/BulletDotNETPrim.cs b/OpenSim/Region/Physics/BulletDotNETPlugin/BulletDotNETPrim.cs index 9603ea4..f430def 100644 --- a/OpenSim/Region/Physics/BulletDotNETPlugin/BulletDotNETPrim.cs +++ b/OpenSim/Region/Physics/BulletDotNETPlugin/BulletDotNETPrim.cs | |||
| @@ -396,7 +396,17 @@ namespace OpenSim.Region.Physics.BulletDotNETPlugin | |||
| 396 | { | 396 | { |
| 397 | //TODO: | 397 | //TODO: |
| 398 | } | 398 | } |
| 399 | |||
| 400 | public override void VehicleFlagsSet(int flags) | ||
| 401 | { | ||
| 402 | |||
| 403 | } | ||
| 404 | |||
| 405 | public override void VehicleFlagsRemove(int flags) | ||
| 406 | { | ||
| 399 | 407 | ||
| 408 | } | ||
| 409 | |||
| 400 | public override void SetVolumeDetect(int param) | 410 | public override void SetVolumeDetect(int param) |
| 401 | { | 411 | { |
| 402 | //TODO: GhostObject | 412 | //TODO: GhostObject |