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/POSPlugin | |
| parent | minor: Make SOG.DelinkFromGroup() return the newly delinked scene object inst... (diff) | |
| parent | Formatting cleanup. (diff) | |
| download | opensim-SC_OLD-4c90ee29432539efbf5942010dd574822235ed57.zip opensim-SC_OLD-4c90ee29432539efbf5942010dd574822235ed57.tar.gz opensim-SC_OLD-4c90ee29432539efbf5942010dd574822235ed57.tar.bz2 opensim-SC_OLD-4c90ee29432539efbf5942010dd574822235ed57.tar.xz | |
Merge branch 'master' of ssh://justincc@opensimulator.org/var/git/opensim
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 | ||