diff options
| author | Kitto Flora | 2010-03-12 13:48:31 -0500 |
|---|---|---|
| committer | Kitto Flora | 2010-03-12 13:48:31 -0500 |
| commit | 7bd48d383d3383c1e633f76f76a5291f4224d48a (patch) | |
| tree | 18997a5b1a123091af18a1a7984d7dd7873930ac /OpenSim/Region/Physics/POSPlugin | |
| parent | Dynamics Integration Part 1 (diff) | |
| parent | Small consistency change (diff) | |
| download | opensim-SC-7bd48d383d3383c1e633f76f76a5291f4224d48a.zip opensim-SC-7bd48d383d3383c1e633f76f76a5291f4224d48a.tar.gz opensim-SC-7bd48d383d3383c1e633f76f76a5291f4224d48a.tar.bz2 opensim-SC-7bd48d383d3383c1e633f76f76a5291f4224d48a.tar.xz | |
Resolved merge
Diffstat (limited to 'OpenSim/Region/Physics/POSPlugin')
| -rw-r--r-- | OpenSim/Region/Physics/POSPlugin/POSCharacter.cs | 10 | ||||
| -rw-r--r-- | OpenSim/Region/Physics/POSPlugin/POSPrim.cs | 10 |
2 files changed, 2 insertions, 18 deletions
diff --git a/OpenSim/Region/Physics/POSPlugin/POSCharacter.cs b/OpenSim/Region/Physics/POSPlugin/POSCharacter.cs index 491e200..a70179b 100644 --- a/OpenSim/Region/Physics/POSPlugin/POSCharacter.cs +++ b/OpenSim/Region/Physics/POSPlugin/POSCharacter.cs | |||
| @@ -181,17 +181,9 @@ namespace OpenSim.Region.Physics.POSPlugin | |||
| 181 | { | 181 | { |
| 182 | 182 | ||
| 183 | } | 183 | } |
| 184 | |||
| 185 | public override void VehicleFlagsSet(int flags) | ||
| 186 | { | ||
| 187 | 184 | ||
| 188 | } | 185 | public override void VehicleFlags(int param, bool remove) { } |
| 189 | |||
| 190 | public override void VehicleFlagsRemove(int flags) | ||
| 191 | { | ||
| 192 | 186 | ||
| 193 | } | ||
| 194 | |||
| 195 | public override void SetVolumeDetect(int param) | 187 | public override void SetVolumeDetect(int param) |
| 196 | { | 188 | { |
| 197 | 189 | ||
diff --git a/OpenSim/Region/Physics/POSPlugin/POSPrim.cs b/OpenSim/Region/Physics/POSPlugin/POSPrim.cs index f8d49f9..9ba5ebb 100644 --- a/OpenSim/Region/Physics/POSPlugin/POSPrim.cs +++ b/OpenSim/Region/Physics/POSPlugin/POSPrim.cs | |||
| @@ -138,17 +138,9 @@ namespace OpenSim.Region.Physics.POSPlugin | |||
| 138 | { | 138 | { |
| 139 | 139 | ||
| 140 | } | 140 | } |
| 141 | |||
| 142 | public override void VehicleFlagsSet(int flags) | ||
| 143 | { | ||
| 144 | 141 | ||
| 145 | } | 142 | public override void VehicleFlags(int param, bool remove) { } |
| 146 | |||
| 147 | public override void VehicleFlagsRemove(int flags) | ||
| 148 | { | ||
| 149 | 143 | ||
| 150 | } | ||
| 151 | |||
| 152 | public override void SetVolumeDetect(int param) | 144 | public override void SetVolumeDetect(int param) |
| 153 | { | 145 | { |
| 154 | 146 | ||