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/POSPlugin | |
| 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/POSPlugin/POSCharacter.cs | 2 | ||||
| -rw-r--r-- | OpenSim/Region/Physics/POSPlugin/POSPrim.cs | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/OpenSim/Region/Physics/POSPlugin/POSCharacter.cs b/OpenSim/Region/Physics/POSPlugin/POSCharacter.cs index 491e200..e722666 100644 --- a/OpenSim/Region/Physics/POSPlugin/POSCharacter.cs +++ b/OpenSim/Region/Physics/POSPlugin/POSCharacter.cs | |||
| @@ -192,6 +192,8 @@ namespace OpenSim.Region.Physics.POSPlugin | |||
| 192 | 192 | ||
| 193 | } | 193 | } |
| 194 | 194 | ||
| 195 | public override void VehicleFlags(int param, bool remove) { } | ||
| 196 | |||
| 195 | public override void SetVolumeDetect(int param) | 197 | public override void SetVolumeDetect(int param) |
| 196 | { | 198 | { |
| 197 | 199 | ||
diff --git a/OpenSim/Region/Physics/POSPlugin/POSPrim.cs b/OpenSim/Region/Physics/POSPlugin/POSPrim.cs index f8d49f9..c129340 100644 --- a/OpenSim/Region/Physics/POSPlugin/POSPrim.cs +++ b/OpenSim/Region/Physics/POSPlugin/POSPrim.cs | |||
| @@ -149,6 +149,8 @@ namespace OpenSim.Region.Physics.POSPlugin | |||
| 149 | 149 | ||
| 150 | } | 150 | } |
| 151 | 151 | ||
| 152 | public override void VehicleFlags(int param, bool remove) { } | ||
| 153 | |||
| 152 | public override void SetVolumeDetect(int param) | 154 | public override void SetVolumeDetect(int param) |
| 153 | { | 155 | { |
| 154 | 156 | ||