Resolved merge

1 files changed, 2 insertions, 7 deletions

diff --git a/OpenSim/Region/Physics/BasicPhysicsPlugin/BasicPhysicsActor.cs b/OpenSim/Region/Physics/BasicPhysicsPlugin/BasicPhysicsActor.cs
index 25b9099..5e2eeeb 100644
--- a/OpenSim/Region/Physics/BasicPhysicsPlugin/BasicPhysicsActor.cs
+++ b/OpenSim/Region/Physics/BasicPhysicsPlugin/BasicPhysicsActor.cs
@@ -184,17 +184,12 @@ namespace OpenSim.Region.Physics.BasicPhysicsPlugin
         {
 
         }
-        
-        public override void VehicleFlagsSet(int flags)
-        {
 
-        }
-        
-        public override void VehicleFlagsRemove(int flags)
+        public override void VehicleFlags(int param, bool remove)
         {
 
         }
-        
+
         public override void SetVolumeDetect(int param)
         {