Merge branch 'master' into careminster-presence-refactor

This brings careminster on the level of master. To be tested

1 files changed, 6 insertions, 0 deletions

diff --git a/OpenSim/Region/Physics/Manager/PhysicsActor.cs b/OpenSim/Region/Physics/Manager/PhysicsActor.cs
index f43de48..8060ba0 100644
--- a/OpenSim/Region/Physics/Manager/PhysicsActor.cs
+++ b/OpenSim/Region/Physics/Manager/PhysicsActor.cs
@@ -210,6 +210,7 @@ namespace OpenSim.Region.Physics.Manager
         public abstract void VehicleRotationParam(int param, Quaternion rotation);
         public abstract void VehicleFlagsSet(int flags);
         public abstract void VehicleFlagsRemove(int flags);
+        public abstract void VehicleFlags(int param, bool remove);
 
         public abstract void SetVolumeDetect(int param);    // Allows the detection of collisions with inherently non-physical prims. see llVolumeDetect for more
 
@@ -364,6 +365,11 @@ namespace OpenSim.Region.Physics.Manager
 
         }
         
+        public override void VehicleFlags(int param, bool remove)
+        {
+            
+        }
+
         public override void SetVolumeDetect(int param)
         {