Add glue for llSetVehicleFlags(), llRemoveVehicleFlags(). ChODE: Add associated methods.

15 files changed, 174 insertions, 4 deletions

diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
index 4c97467..04be9fc 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
@@ -2963,7 +2963,23 @@ namespace OpenSim.Region.Framework.Scenes
                 PhysActor.VehicleRotationParam(param, rotation);
             }
         }
-
+        
+        public void SetVehicleFlags(int flags)
+        {
+            if (PhysActor != null)
+            {
+                PhysActor.VehicleFlagsSet(flags);
+            }
+        } 
+        
+        public void RemoveVehicleFlags(int flags)
+        {
+            if (PhysActor != null)
+            {
+                PhysActor.VehicleFlagsRemove(flags);
+            }
+        } 
+        
         public void SetGroup(UUID groupID, IClientAPI client)
         {
             _groupID = groupID;
diff --git a/OpenSim/Region/Physics/BasicPhysicsPlugin/BasicPhysicsActor.cs b/OpenSim/Region/Physics/BasicPhysicsPlugin/BasicPhysicsActor.cs
index 31366db..25b9099 100644
--- a/OpenSim/Region/Physics/BasicPhysicsPlugin/BasicPhysicsActor.cs
+++ b/OpenSim/Region/Physics/BasicPhysicsPlugin/BasicPhysicsActor.cs
@@ -184,7 +184,17 @@ namespace OpenSim.Region.Physics.BasicPhysicsPlugin
         {
 
         }
+        
+        public override void VehicleFlagsSet(int flags)
+        {
+
+        }
+        
+        public override void VehicleFlagsRemove(int flags)
+        {
 
+        }
+        
         public override void SetVolumeDetect(int param)
         {
 
diff --git a/OpenSim/Region/Physics/BulletDotNETPlugin/BulletDotNETCharacter.cs b/OpenSim/Region/Physics/BulletDotNETPlugin/BulletDotNETCharacter.cs
index a3344dd..120d040 100644
--- a/OpenSim/Region/Physics/BulletDotNETPlugin/BulletDotNETCharacter.cs
+++ b/OpenSim/Region/Physics/BulletDotNETPlugin/BulletDotNETCharacter.cs
@@ -361,7 +361,17 @@ namespace OpenSim.Region.Physics.BulletDotNETPlugin
         {
             
         }
+        
+        public override void VehicleFlagsSet(int flags)
+        {
+
+        }
+        
+        public override void VehicleFlagsRemove(int flags)
+        {
 
+        }
+        
         public override void SetVolumeDetect(int param)
         {
             
diff --git a/OpenSim/Region/Physics/BulletDotNETPlugin/BulletDotNETPrim.cs b/OpenSim/Region/Physics/BulletDotNETPlugin/BulletDotNETPrim.cs
index 9603ea4..f430def 100644
--- a/OpenSim/Region/Physics/BulletDotNETPlugin/BulletDotNETPrim.cs
+++ b/OpenSim/Region/Physics/BulletDotNETPlugin/BulletDotNETPrim.cs
@@ -396,7 +396,17 @@ namespace OpenSim.Region.Physics.BulletDotNETPlugin
         {
             //TODO:
         }
+        
+        public override void VehicleFlagsSet(int flags)
+        {
+
+        }
+        
+        public override void VehicleFlagsRemove(int flags)
+        {
 
+        }
+        
         public override void SetVolumeDetect(int param)
         {
             //TODO: GhostObject
diff --git a/OpenSim/Region/Physics/BulletXPlugin/BulletXPlugin.cs b/OpenSim/Region/Physics/BulletXPlugin/BulletXPlugin.cs
index d5d146e..9113ebe 100644
--- a/OpenSim/Region/Physics/BulletXPlugin/BulletXPlugin.cs
+++ b/OpenSim/Region/Physics/BulletXPlugin/BulletXPlugin.cs
@@ -984,7 +984,17 @@ namespace OpenSim.Region.Physics.BulletXPlugin
         {
 
         }
+        
+        public override void VehicleFlagsSet(int flags)
+        {
+
+        }
+        
+        public override void VehicleFlagsRemove(int flags)
+        {
 
+        }
+        
         public override void SetVolumeDetect(int param)
         {
 
diff --git a/OpenSim/Region/Physics/ChOdePlugin/ODECharacter.cs b/OpenSim/Region/Physics/ChOdePlugin/ODECharacter.cs
index aa0acb7..2eb519f 100644
--- a/OpenSim/Region/Physics/ChOdePlugin/ODECharacter.cs
+++ b/OpenSim/Region/Physics/ChOdePlugin/ODECharacter.cs
@@ -733,7 +733,17 @@ namespace OpenSim.Region.Physics.OdePlugin
         {
 
         }
+        
+        public override void VehicleFlagsSet(int flags)
+        {
 
+        }
+        
+        public override void VehicleFlagsRemove(int flags)
+        {
+
+        }
+        
         public override void SetVolumeDetect(int param)
         {
 
diff --git a/OpenSim/Region/Physics/ChOdePlugin/ODEDynamics.cs b/OpenSim/Region/Physics/ChOdePlugin/ODEDynamics.cs
index 9e145ec..14d5caa 100644
--- a/OpenSim/Region/Physics/ChOdePlugin/ODEDynamics.cs
+++ b/OpenSim/Region/Physics/ChOdePlugin/ODEDynamics.cs
@@ -286,7 +286,17 @@ namespace OpenSim.Region.Physics.OdePlugin
             }
             
         }//end ProcessRotationVehicleParam
+        
+        internal void ProcessFlagsVehicleSet(int flags)
+        {
+                m_flags |= (VehicleFlag)flags;
+        }
 
+        internal void ProcessFlagsVehicleRemove(int flags)
+        {
+                m_flags &= ~((VehicleFlag)flags);         
+        }
+        
         internal void ProcessTypeChange(Vehicle pType)
         {
                         // Set Defaults For Type
diff --git a/OpenSim/Region/Physics/ChOdePlugin/ODEPrim.cs b/OpenSim/Region/Physics/ChOdePlugin/ODEPrim.cs
index 6e6b44f..29a3dd9 100644
--- a/OpenSim/Region/Physics/ChOdePlugin/ODEPrim.cs
+++ b/OpenSim/Region/Physics/ChOdePlugin/ODEPrim.cs
@@ -2415,7 +2415,17 @@ Console.WriteLine(" JointCreateFixed");
         {
             m_vehicle.ProcessRotationVehicleParam((Vehicle) param, rotation);
         }
-
+        
+        public override void VehicleFlagsSet(int flags)
+        {
+                        m_vehicle.ProcessFlagsVehicleSet(flags);
+        }
+        
+        public override void VehicleFlagsRemove(int flags)
+        {
+                        m_vehicle.ProcessFlagsVehicleRemove(flags);
+        }
+        
         public override void SetVolumeDetect(int param)
         {
             lock (_parent_scene.OdeLock)
diff --git a/OpenSim/Region/Physics/Manager/PhysicsActor.cs b/OpenSim/Region/Physics/Manager/PhysicsActor.cs
index 9c192ed..f43de48 100644
--- a/OpenSim/Region/Physics/Manager/PhysicsActor.cs
+++ b/OpenSim/Region/Physics/Manager/PhysicsActor.cs
@@ -208,6 +208,8 @@ namespace OpenSim.Region.Physics.Manager
         public abstract void VehicleFloatParam(int param, float value);
         public abstract void VehicleVectorParam(int param, Vector3 value);
         public abstract void VehicleRotationParam(int param, Quaternion rotation);
+        public abstract void VehicleFlagsSet(int flags);
+        public abstract void VehicleFlagsRemove(int flags);
 
         public abstract void SetVolumeDetect(int param);    // Allows the detection of collisions with inherently non-physical prims. see llVolumeDetect for more
 
@@ -351,7 +353,17 @@ namespace OpenSim.Region.Physics.Manager
         {
 
         }
+        
+        public override void VehicleFlagsSet(int flags)
+        {
+
+        }
+        
+        public override void VehicleFlagsRemove(int flags)
+        {
 
+        }
+        
         public override void SetVolumeDetect(int param)
         {
 
diff --git a/OpenSim/Region/Physics/OdePlugin/ODECharacter.cs b/OpenSim/Region/Physics/OdePlugin/ODECharacter.cs
index a38fccc..b713142 100644
--- a/OpenSim/Region/Physics/OdePlugin/ODECharacter.cs
+++ b/OpenSim/Region/Physics/OdePlugin/ODECharacter.cs
@@ -733,7 +733,17 @@ namespace OpenSim.Region.Physics.OdePlugin
         {
 
         }
+        
+        public override void VehicleFlagsSet(int flags)
+        {
+
+        }
+        
+        public override void VehicleFlagsRemove(int flags)
+        {
 
+        }
+        
         public override void SetVolumeDetect(int param)
         {
 
diff --git a/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs b/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs
index 567fd0e..010d97f 100644
--- a/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs
+++ b/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs
@@ -2352,6 +2352,16 @@ Console.WriteLine(" JointCreateFixed");
         {
             m_vehicle.ProcessRotationVehicleParam((Vehicle) param, rotation);
         }
+                
+        public override void VehicleFlagsSet(int flags)
+        {
+
+        }
+        
+        public override void VehicleFlagsRemove(int flags)
+        {
+
+        }
 
         public override void SetVolumeDetect(int param)
         {
diff --git a/OpenSim/Region/Physics/POSPlugin/POSCharacter.cs b/OpenSim/Region/Physics/POSPlugin/POSCharacter.cs
index 566b4e7..491e200 100644
--- a/OpenSim/Region/Physics/POSPlugin/POSCharacter.cs
+++ b/OpenSim/Region/Physics/POSPlugin/POSCharacter.cs
@@ -181,7 +181,17 @@ namespace OpenSim.Region.Physics.POSPlugin
         {
 
         }
+        
+        public override void VehicleFlagsSet(int flags)
+        {
+
+        }
+        
+        public override void VehicleFlagsRemove(int flags)
+        {
 
+        }
+        
         public override void SetVolumeDetect(int param)
         {
 
diff --git a/OpenSim/Region/Physics/POSPlugin/POSPrim.cs b/OpenSim/Region/Physics/POSPlugin/POSPrim.cs
index edccf47..f8d49f9 100644
--- a/OpenSim/Region/Physics/POSPlugin/POSPrim.cs
+++ b/OpenSim/Region/Physics/POSPlugin/POSPrim.cs
@@ -138,7 +138,17 @@ namespace OpenSim.Region.Physics.POSPlugin
         {
 
         }
+        
+        public override void VehicleFlagsSet(int flags)
+        {
 
+        }
+        
+        public override void VehicleFlagsRemove(int flags)
+        {
+
+        }
+        
         public override void SetVolumeDetect(int param)
         {
 
diff --git a/OpenSim/Region/Physics/PhysXPlugin/PhysXPlugin.cs b/OpenSim/Region/Physics/PhysXPlugin/PhysXPlugin.cs
index 24eb6b1..e54065c 100644
--- a/OpenSim/Region/Physics/PhysXPlugin/PhysXPlugin.cs
+++ b/OpenSim/Region/Physics/PhysXPlugin/PhysXPlugin.cs
@@ -370,7 +370,17 @@ namespace OpenSim.Region.Physics.PhysXPlugin
         {
 
         }
+        
+        public override void VehicleFlagsSet(int flags)
+        {
+
+        }
+        
+        public override void VehicleFlagsRemove(int flags)
+        {
 
+        }
+        
         public override void SetVolumeDetect(int param)
         {
 
@@ -774,7 +784,17 @@ namespace OpenSim.Region.Physics.PhysXPlugin
         {
 
         }
+        
+        public override void VehicleFlagsSet(int flags)
+        {
+
+        }
+        
+        public override void VehicleFlagsRemove(int flags)
+        {
 
+        }
+        
         public override void SetVolumeDetect(int param)
         {
 
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
index a5aecd8..33218aa 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
@@ -6315,13 +6315,25 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
         public void llSetVehicleFlags(int flags)
         {
             m_host.AddScriptLPS(1);
-            NotImplemented("llSetVehicleFlags");
+            if (m_host.ParentGroup != null)
+            {
+                if (!m_host.ParentGroup.IsDeleted)
+                {
+                    m_host.ParentGroup.RootPart.SetVehicleFlags(flags);
+                }
+            }
         }
 
         public void llRemoveVehicleFlags(int flags)
         {
             m_host.AddScriptLPS(1);
-            NotImplemented("llRemoveVehicleFlags");
+            if (m_host.ParentGroup != null)
+            {
+                if (!m_host.ParentGroup.IsDeleted)
+                {
+                    m_host.ParentGroup.RootPart.RemoveVehicleFlags(flags);
+                }
+            }
         }
 
         public void llSitTarget(LSL_Vector offset, LSL_Rotation rot)