diff options
| author | Melanie | 2010-03-06 12:24:09 +0000 |
|---|---|---|
| committer | Melanie | 2010-03-06 12:24:09 +0000 |
| commit | 1f7a0cf892bf23c5b8ba8e3ae1a9036de428db90 (patch) | |
| tree | 69419084feb98d59888b59a643e5fa062314605d /OpenSim/Region/Physics/BulletDotNETPlugin | |
| parent | Remove a superfluous array creation (diff) | |
| parent | - implementing server 1.38 functions (diff) | |
| download | opensim-SC-1f7a0cf892bf23c5b8ba8e3ae1a9036de428db90.zip opensim-SC-1f7a0cf892bf23c5b8ba8e3ae1a9036de428db90.tar.gz opensim-SC-1f7a0cf892bf23c5b8ba8e3ae1a9036de428db90.tar.bz2 opensim-SC-1f7a0cf892bf23c5b8ba8e3ae1a9036de428db90.tar.xz | |
Merge branch '0.6.9-post-fixes' into careminster
Diffstat (limited to '')
| -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 120d040..7d5c078 100644 --- a/OpenSim/Region/Physics/BulletDotNETPlugin/BulletDotNETCharacter.cs +++ b/OpenSim/Region/Physics/BulletDotNETPlugin/BulletDotNETCharacter.cs | |||
| @@ -372,6 +372,11 @@ namespace OpenSim.Region.Physics.BulletDotNETPlugin | |||
| 372 | 372 | ||
| 373 | } | 373 | } |
| 374 | 374 | ||
| 375 | public override void VehicleFlags(int param, bool remove) | ||
| 376 | { | ||
| 377 | |||
| 378 | } | ||
| 379 | |||
| 375 | public override void SetVolumeDetect(int param) | 380 | public override void SetVolumeDetect(int param) |
| 376 | { | 381 | { |
| 377 | 382 | ||
diff --git a/OpenSim/Region/Physics/BulletDotNETPlugin/BulletDotNETPrim.cs b/OpenSim/Region/Physics/BulletDotNETPlugin/BulletDotNETPrim.cs index f430def..1f3e031 100644 --- a/OpenSim/Region/Physics/BulletDotNETPlugin/BulletDotNETPrim.cs +++ b/OpenSim/Region/Physics/BulletDotNETPlugin/BulletDotNETPrim.cs | |||
| @@ -407,6 +407,11 @@ namespace OpenSim.Region.Physics.BulletDotNETPlugin | |||
| 407 | 407 | ||
| 408 | } | 408 | } |
| 409 | 409 | ||
| 410 | public override void VehicleFlags(int param, bool remove) | ||
| 411 | { | ||
| 412 | |||
| 413 | } | ||
| 414 | |||
| 410 | public override void SetVolumeDetect(int param) | 415 | public override void SetVolumeDetect(int param) |
| 411 | { | 416 | { |
| 412 | //TODO: GhostObject | 417 | //TODO: GhostObject |