diff options
| author | Melanie | 2010-02-15 00:20:48 +0000 |
|---|---|---|
| committer | Melanie | 2010-02-15 00:20:48 +0000 |
| commit | c033223c63274ebe41075b24d108ca952fbd242c (patch) | |
| tree | 8c969a9643c469feb37133b175be18eb52fdff49 /OpenSim/Region/Physics/POSPlugin | |
| parent | Extraneous debug messages removed (diff) | |
| parent | Plug a small hole (diff) | |
| download | opensim-SC_OLD-c033223c63274ebe41075b24d108ca952fbd242c.zip opensim-SC_OLD-c033223c63274ebe41075b24d108ca952fbd242c.tar.gz opensim-SC_OLD-c033223c63274ebe41075b24d108ca952fbd242c.tar.bz2 opensim-SC_OLD-c033223c63274ebe41075b24d108ca952fbd242c.tar.xz | |
Merge branch 'master' into presence-refactor
Diffstat (limited to 'OpenSim/Region/Physics/POSPlugin')
| -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 566b4e7..a70179b 100644 --- a/OpenSim/Region/Physics/POSPlugin/POSCharacter.cs +++ b/OpenSim/Region/Physics/POSPlugin/POSCharacter.cs | |||
| @@ -182,6 +182,8 @@ namespace OpenSim.Region.Physics.POSPlugin | |||
| 182 | 182 | ||
| 183 | } | 183 | } |
| 184 | 184 | ||
| 185 | public override void VehicleFlags(int param, bool remove) { } | ||
| 186 | |||
| 185 | public override void SetVolumeDetect(int param) | 187 | public override void SetVolumeDetect(int param) |
| 186 | { | 188 | { |
| 187 | 189 | ||
diff --git a/OpenSim/Region/Physics/POSPlugin/POSPrim.cs b/OpenSim/Region/Physics/POSPlugin/POSPrim.cs index 7447f76..91ec3df 100644 --- a/OpenSim/Region/Physics/POSPlugin/POSPrim.cs +++ b/OpenSim/Region/Physics/POSPlugin/POSPrim.cs | |||
| @@ -139,6 +139,8 @@ namespace OpenSim.Region.Physics.POSPlugin | |||
| 139 | 139 | ||
| 140 | } | 140 | } |
| 141 | 141 | ||
| 142 | public override void VehicleFlags(int param, bool remove) { } | ||
| 143 | |||
| 142 | public override void SetVolumeDetect(int param) | 144 | public override void SetVolumeDetect(int param) |
| 143 | { | 145 | { |
| 144 | 146 | ||