diff options
| author | Justin Clark-Casey (justincc) | 2010-02-16 19:08:06 +0000 |
|---|---|---|
| committer | Justin Clark-Casey (justincc) | 2010-02-16 19:08:06 +0000 |
| commit | 4c90ee29432539efbf5942010dd574822235ed57 (patch) | |
| tree | d159f72df97dfef5719221301009e90f375f2ef2 /OpenSim/Region/Physics/BulletDotNETPlugin | |
| parent | minor: Make SOG.DelinkFromGroup() return the newly delinked scene object inst... (diff) | |
| parent | Formatting cleanup. (diff) | |
| download | opensim-SC-4c90ee29432539efbf5942010dd574822235ed57.zip opensim-SC-4c90ee29432539efbf5942010dd574822235ed57.tar.gz opensim-SC-4c90ee29432539efbf5942010dd574822235ed57.tar.bz2 opensim-SC-4c90ee29432539efbf5942010dd574822235ed57.tar.xz | |
Merge branch 'master' of ssh://justincc@opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Region/Physics/BulletDotNETPlugin')
| -rw-r--r-- | OpenSim/Region/Physics/BulletDotNETPlugin/BulletDotNETCharacter.cs | 5 | ||||
| -rw-r--r-- | OpenSim/Region/Physics/BulletDotNETPlugin/BulletDotNETPrim.cs | 5 |
2 files changed, 10 insertions, 0 deletions
diff --git a/OpenSim/Region/Physics/BulletDotNETPlugin/BulletDotNETCharacter.cs b/OpenSim/Region/Physics/BulletDotNETPlugin/BulletDotNETCharacter.cs index 97eb6a2..6a54705 100644 --- a/OpenSim/Region/Physics/BulletDotNETPlugin/BulletDotNETCharacter.cs +++ b/OpenSim/Region/Physics/BulletDotNETPlugin/BulletDotNETCharacter.cs | |||
| @@ -362,6 +362,11 @@ namespace OpenSim.Region.Physics.BulletDotNETPlugin | |||
| 362 | 362 | ||
| 363 | } | 363 | } |
| 364 | 364 | ||
| 365 | public override void VehicleFlags(int param, bool remove) | ||
| 366 | { | ||
| 367 | |||
| 368 | } | ||
| 369 | |||
| 365 | public override void SetVolumeDetect(int param) | 370 | public override void SetVolumeDetect(int param) |
| 366 | { | 371 | { |
| 367 | 372 | ||
diff --git a/OpenSim/Region/Physics/BulletDotNETPlugin/BulletDotNETPrim.cs b/OpenSim/Region/Physics/BulletDotNETPlugin/BulletDotNETPrim.cs index 9603ea4..920ed96 100644 --- a/OpenSim/Region/Physics/BulletDotNETPlugin/BulletDotNETPrim.cs +++ b/OpenSim/Region/Physics/BulletDotNETPlugin/BulletDotNETPrim.cs | |||
| @@ -397,6 +397,11 @@ namespace OpenSim.Region.Physics.BulletDotNETPlugin | |||
| 397 | //TODO: | 397 | //TODO: |
| 398 | } | 398 | } |
| 399 | 399 | ||
| 400 | public override void VehicleFlags(int param, bool remove) | ||
| 401 | { | ||
| 402 | |||
| 403 | } | ||
| 404 | |||
| 400 | public override void SetVolumeDetect(int param) | 405 | public override void SetVolumeDetect(int param) |
| 401 | { | 406 | { |
| 402 | //TODO: GhostObject | 407 | //TODO: GhostObject |