BulletSim: in BSDynamics, merge 'flags' and 'hoverFlags' as they are defined for the same bits and it makes the code less complicated.

author: Robert Adams 2012-08-15 16:49:05 -0700
committer: Robert Adams 2012-08-17 13:34:14 -0700
commit: e31e23d68d9935457ad86559bea37b2b4a63a8dc (patch)
tree: 6f18a7346be0b997fbeb0fdd5c3159ec6cfe9067
parent: Merge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff)
download: opensim-SC-e31e23d68d9935457ad86559bea37b2b4a63a8dc.zip
opensim-SC-e31e23d68d9935457ad86559bea37b2b4a63a8dc.tar.gz
opensim-SC-e31e23d68d9935457ad86559bea37b2b4a63a8dc.tar.bz2
opensim-SC-e31e23d68d9935457ad86559bea37b2b4a63a8dc.tar.xz
1 files changed, 20 insertions, 158 deletions
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSDynamics.cs b/OpenSim/Region/Physics/BulletSPlugin/BSDynamics.cs
index 5a9f135..78bfa05 100644
--- a/OpenSim/Region/Physics/BulletSPlugin/BSDynamics.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSDynamics.cs
@@ -74,7 +74,6 @@ namespace OpenSim.Region.Physics.BulletSPlugin
                                                                        // HOVER_UP_ONLY
                                                                        // LIMIT_MOTOR_UP
                                                                        // LIMIT_ROLL_ONLY
-        private VehicleFlag m_Hoverflags = (VehicleFlag)0;
        private Vector3 m_BlockingEndPoint = Vector3.Zero;
        private Quaternion m_RollreferenceFrame = Quaternion.Identity;
        // Linear properties
@@ -281,157 +280,20 @@ namespace OpenSim.Region.Physics.BulletSPlugin
        internal void ProcessVehicleFlags(int pParam, bool remove)
        {
            DetailLog("{0},ProcessVehicleFlags,param={1},remove={2}", m_prim.LocalID, pParam, remove);
+            VehicleFlag parm = (VehicleFlag)pParam;
            if (remove)
            {
                if (pParam == -1)
                {
                    m_flags = (VehicleFlag)0;
-                    m_Hoverflags = (VehicleFlag)0;
-                    return;
                }
-                if ((pParam & (int)VehicleFlag.HOVER_GLOBAL_HEIGHT) == (int)VehicleFlag.HOVER_GLOBAL_HEIGHT)
+                else
-                {
-                    if ((m_Hoverflags & VehicleFlag.HOVER_GLOBAL_HEIGHT) != (VehicleFlag)0)
-                        m_Hoverflags &= ~(VehicleFlag.HOVER_GLOBAL_HEIGHT);
-                }
-                if ((pParam & (int)VehicleFlag.HOVER_TERRAIN_ONLY) == (int)VehicleFlag.HOVER_TERRAIN_ONLY)
-                {
-                    if ((m_Hoverflags & VehicleFlag.HOVER_TERRAIN_ONLY) != (VehicleFlag)0)
-                        m_Hoverflags &= ~(VehicleFlag.HOVER_TERRAIN_ONLY);
-                }
-                if ((pParam & (int)VehicleFlag.HOVER_UP_ONLY) == (int)VehicleFlag.HOVER_UP_ONLY)
-                {
-                    if ((m_Hoverflags & VehicleFlag.HOVER_UP_ONLY) != (VehicleFlag)0)
-                        m_Hoverflags &= ~(VehicleFlag.HOVER_UP_ONLY);
-                }
-                if ((pParam & (int)VehicleFlag.HOVER_WATER_ONLY) == (int)VehicleFlag.HOVER_WATER_ONLY)
-                {
-                    if ((m_Hoverflags & VehicleFlag.HOVER_WATER_ONLY) != (VehicleFlag)0)
-                        m_Hoverflags &= ~(VehicleFlag.HOVER_WATER_ONLY);
-                }
-                if ((pParam & (int)VehicleFlag.LIMIT_MOTOR_UP) == (int)VehicleFlag.LIMIT_MOTOR_UP)
-                {
-                    if ((m_flags & VehicleFlag.LIMIT_MOTOR_UP) != (VehicleFlag)0)
-                        m_flags &= ~(VehicleFlag.LIMIT_MOTOR_UP);
-                }
-                if ((pParam & (int)VehicleFlag.LIMIT_ROLL_ONLY) == (int)VehicleFlag.LIMIT_ROLL_ONLY)
-                {
-                    if ((m_flags & VehicleFlag.LIMIT_ROLL_ONLY) != (VehicleFlag)0)
-                        m_flags &= ~(VehicleFlag.LIMIT_ROLL_ONLY);
-                }
-                if ((pParam & (int)VehicleFlag.MOUSELOOK_BANK) == (int)VehicleFlag.MOUSELOOK_BANK)
-                {
-                    if ((m_flags & VehicleFlag.MOUSELOOK_BANK) != (VehicleFlag)0)
-                        m_flags &= ~(VehicleFlag.MOUSELOOK_BANK);
-                }
-                if ((pParam & (int)VehicleFlag.MOUSELOOK_STEER) == (int)VehicleFlag.MOUSELOOK_STEER)
-                {
-                    if ((m_flags & VehicleFlag.MOUSELOOK_STEER) != (VehicleFlag)0)
-                        m_flags &= ~(VehicleFlag.MOUSELOOK_STEER);
-                }
-                if ((pParam & (int)VehicleFlag.NO_DEFLECTION_UP) == (int)VehicleFlag.NO_DEFLECTION_UP)
-                {
-                    if ((m_flags & VehicleFlag.NO_DEFLECTION_UP) != (VehicleFlag)0)
-                        m_flags &= ~(VehicleFlag.NO_DEFLECTION_UP);
-                }
-                if ((pParam & (int)VehicleFlag.CAMERA_DECOUPLED) == (int)VehicleFlag.CAMERA_DECOUPLED)
-                {
-                    if ((m_flags & VehicleFlag.CAMERA_DECOUPLED) != (VehicleFlag)0)
-                        m_flags &= ~(VehicleFlag.CAMERA_DECOUPLED);
-                }
-                if ((pParam & (int)VehicleFlag.NO_X) == (int)VehicleFlag.NO_X)
-                {
-                    if ((m_flags & VehicleFlag.NO_X) != (VehicleFlag)0)
-                        m_flags &= ~(VehicleFlag.NO_X);
-                }
-                if ((pParam & (int)VehicleFlag.NO_Y) == (int)VehicleFlag.NO_Y)
-                {
-                    if ((m_flags & VehicleFlag.NO_Y) != (VehicleFlag)0)
-                        m_flags &= ~(VehicleFlag.NO_Y);
-                }
-                if ((pParam & (int)VehicleFlag.NO_Z) == (int)VehicleFlag.NO_Z)
-                {
-                    if ((m_flags & VehicleFlag.NO_Z) != (VehicleFlag)0)
-                        m_flags &= ~(VehicleFlag.NO_Z);
-                }
-                if ((pParam & (int)VehicleFlag.LOCK_HOVER_HEIGHT) == (int)VehicleFlag.LOCK_HOVER_HEIGHT)
-                {
-                    if ((m_Hoverflags & VehicleFlag.LOCK_HOVER_HEIGHT) != (VehicleFlag)0)
-                        m_Hoverflags &= ~(VehicleFlag.LOCK_HOVER_HEIGHT);
-                }
-                if ((pParam & (int)VehicleFlag.NO_DEFLECTION) == (int)VehicleFlag.NO_DEFLECTION)
-                {
-                    if ((m_flags & VehicleFlag.NO_DEFLECTION) != (VehicleFlag)0)
-                        m_flags &= ~(VehicleFlag.NO_DEFLECTION);
-                }
-                if ((pParam & (int)VehicleFlag.LOCK_ROTATION) == (int)VehicleFlag.LOCK_ROTATION)
                {
-                    if ((m_flags & VehicleFlag.LOCK_ROTATION) != (VehicleFlag)0)
+                    m_flags &= ~parm;
-                        m_flags &= ~(VehicleFlag.LOCK_ROTATION);
                }
            }
-            else
+            else {
-            {
+                m_flags |= parm;
-                if ((pParam & (int)VehicleFlag.HOVER_GLOBAL_HEIGHT) == (int)VehicleFlag.HOVER_GLOBAL_HEIGHT)
-                {
-                    m_Hoverflags |= (VehicleFlag.HOVER_GLOBAL_HEIGHT | m_flags);
-                }
-                if ((pParam & (int)VehicleFlag.HOVER_TERRAIN_ONLY) == (int)VehicleFlag.HOVER_TERRAIN_ONLY)
-                {
-                    m_Hoverflags |= (VehicleFlag.HOVER_TERRAIN_ONLY | m_flags);
-                }
-                if ((pParam & (int)VehicleFlag.HOVER_UP_ONLY) == (int)VehicleFlag.HOVER_UP_ONLY)
-                {
-                    m_Hoverflags |= (VehicleFlag.HOVER_UP_ONLY | m_flags);
-                }
-                if ((pParam & (int)VehicleFlag.HOVER_WATER_ONLY) == (int)VehicleFlag.HOVER_WATER_ONLY)
-                {
-                    m_Hoverflags |= (VehicleFlag.HOVER_WATER_ONLY | m_flags);
-                }
-                if ((pParam & (int)VehicleFlag.LIMIT_MOTOR_UP) == (int)VehicleFlag.LIMIT_MOTOR_UP)
-                {
-                    m_flags |= (VehicleFlag.LIMIT_MOTOR_UP | m_flags);
-                }
-                if ((pParam & (int)VehicleFlag.MOUSELOOK_BANK) == (int)VehicleFlag.MOUSELOOK_BANK)
-                {
-                    m_flags |= (VehicleFlag.MOUSELOOK_BANK | m_flags);
-                }
-                if ((pParam & (int)VehicleFlag.MOUSELOOK_STEER) == (int)VehicleFlag.MOUSELOOK_STEER)
-                {
-                    m_flags |= (VehicleFlag.MOUSELOOK_STEER | m_flags);
-                }
-                if ((pParam & (int)VehicleFlag.NO_DEFLECTION_UP) == (int)VehicleFlag.NO_DEFLECTION_UP)
-                {
-                    m_flags |= (VehicleFlag.NO_DEFLECTION_UP | m_flags);
-                }
-                if ((pParam & (int)VehicleFlag.CAMERA_DECOUPLED) == (int)VehicleFlag.CAMERA_DECOUPLED)
-                {
-                    m_flags |= (VehicleFlag.CAMERA_DECOUPLED | m_flags);
-                }
-                if ((pParam & (int)VehicleFlag.NO_X) == (int)VehicleFlag.NO_X)
-                {
-                    m_flags |= (VehicleFlag.NO_X);
-                }
-                if ((pParam & (int)VehicleFlag.NO_Y) == (int)VehicleFlag.NO_Y)
-                {
-                    m_flags |= (VehicleFlag.NO_Y);
-                }
-                if ((pParam & (int)VehicleFlag.NO_Z) == (int)VehicleFlag.NO_Z)
-                {
-                    m_flags |= (VehicleFlag.NO_Z);
-                }
-                if ((pParam & (int)VehicleFlag.LOCK_HOVER_HEIGHT) == (int)VehicleFlag.LOCK_HOVER_HEIGHT)
-                {
-                    m_Hoverflags |= (VehicleFlag.LOCK_HOVER_HEIGHT);
-                }
-                if ((pParam & (int)VehicleFlag.NO_DEFLECTION) == (int)VehicleFlag.NO_DEFLECTION)
-                {
-                    m_flags |= (VehicleFlag.NO_DEFLECTION);
-                }
-                if ((pParam & (int)VehicleFlag.LOCK_ROTATION) == (int)VehicleFlag.LOCK_ROTATION)
-                {
-                    m_flags |= (VehicleFlag.LOCK_ROTATION);
-                }
            }
        }//end ProcessVehicleFlags
@@ -478,10 +340,10 @@ namespace OpenSim.Region.Physics.BulletSPlugin
                    // m_bankingMix = 1;
                    // m_bankingTimescale = 10;
                    // m_referenceFrame = Quaternion.Identity;
-                    m_Hoverflags &=
+                    m_flags |= (VehicleFlag.NO_DEFLECTION_UP | VehicleFlag.LIMIT_ROLL_ONLY | VehicleFlag.LIMIT_MOTOR_UP);
+                    m_flags &=
                         ~(VehicleFlag.HOVER_WATER_ONLY | VehicleFlag.HOVER_TERRAIN_ONLY |
                           VehicleFlag.HOVER_GLOBAL_HEIGHT | VehicleFlag.HOVER_UP_ONLY);
-                    m_flags |= (VehicleFlag.NO_DEFLECTION_UP | VehicleFlag.LIMIT_ROLL_ONLY | VehicleFlag.LIMIT_MOTOR_UP);
                    break;
                case Vehicle.TYPE_CAR:
                    m_linearFrictionTimescale = new Vector3(100, 2, 1000);
@@ -506,10 +368,10 @@ namespace OpenSim.Region.Physics.BulletSPlugin
                    // m_bankingMix = 1;
                    // m_bankingTimescale = 1;
                    // m_referenceFrame = Quaternion.Identity;
-                    m_Hoverflags &= ~(VehicleFlag.HOVER_WATER_ONLY | VehicleFlag.HOVER_TERRAIN_ONLY | VehicleFlag.HOVER_GLOBAL_HEIGHT);
                    m_flags |= (VehicleFlag.NO_DEFLECTION_UP | VehicleFlag.LIMIT_ROLL_ONLY |
                                VehicleFlag.LIMIT_MOTOR_UP);
-                    m_Hoverflags |= (VehicleFlag.HOVER_UP_ONLY);
+                    m_flags &= ~(VehicleFlag.HOVER_WATER_ONLY | VehicleFlag.HOVER_TERRAIN_ONLY | VehicleFlag.HOVER_GLOBAL_HEIGHT);
+                    m_flags |= (VehicleFlag.HOVER_UP_ONLY);
                    break;
                case Vehicle.TYPE_BOAT:
                    m_linearFrictionTimescale = new Vector3(10, 3, 2);
@@ -534,12 +396,12 @@ namespace OpenSim.Region.Physics.BulletSPlugin
                    // m_bankingMix = 0.8f;
                    // m_bankingTimescale = 1;
                    // m_referenceFrame = Quaternion.Identity;
-                    m_Hoverflags &= ~(VehicleFlag.HOVER_TERRAIN_ONLY |
+                    m_flags &= ~(VehicleFlag.HOVER_TERRAIN_ONLY |
                            VehicleFlag.HOVER_GLOBAL_HEIGHT | VehicleFlag.HOVER_UP_ONLY);
                    m_flags &= ~(VehicleFlag.LIMIT_ROLL_ONLY);
                    m_flags |= (VehicleFlag.NO_DEFLECTION_UP |
                                VehicleFlag.LIMIT_MOTOR_UP);
-                    m_Hoverflags |= (VehicleFlag.HOVER_WATER_ONLY);
+                    m_flags |= (VehicleFlag.HOVER_WATER_ONLY);
                    break;
                case Vehicle.TYPE_AIRPLANE:
                    m_linearFrictionTimescale = new Vector3(200, 10, 5);
@@ -564,7 +426,7 @@ namespace OpenSim.Region.Physics.BulletSPlugin
                    // m_bankingMix = 0.7f;
                    // m_bankingTimescale = 2;
                    // m_referenceFrame = Quaternion.Identity;
-                    m_Hoverflags &= ~(VehicleFlag.HOVER_WATER_ONLY | VehicleFlag.HOVER_TERRAIN_ONLY |
+                    m_flags &= ~(VehicleFlag.HOVER_WATER_ONLY | VehicleFlag.HOVER_TERRAIN_ONLY |
                        VehicleFlag.HOVER_GLOBAL_HEIGHT | VehicleFlag.HOVER_UP_ONLY);
                    m_flags &= ~(VehicleFlag.NO_DEFLECTION_UP | VehicleFlag.LIMIT_MOTOR_UP);
                    m_flags |= (VehicleFlag.LIMIT_ROLL_ONLY);
@@ -592,11 +454,11 @@ namespace OpenSim.Region.Physics.BulletSPlugin
                    // m_bankingMix = 0.7f;
                    // m_bankingTimescale = 5;
                    // m_referenceFrame = Quaternion.Identity;
-                    m_Hoverflags &= ~(VehicleFlag.HOVER_WATER_ONLY | VehicleFlag.HOVER_TERRAIN_ONLY |
+                    m_flags &= ~(VehicleFlag.HOVER_WATER_ONLY | VehicleFlag.HOVER_TERRAIN_ONLY |
                        VehicleFlag.HOVER_UP_ONLY);
                    m_flags &= ~(VehicleFlag.NO_DEFLECTION_UP | VehicleFlag.LIMIT_MOTOR_UP);
                    m_flags |= (VehicleFlag.LIMIT_ROLL_ONLY);
-                    m_Hoverflags |= (VehicleFlag.HOVER_GLOBAL_HEIGHT);
+                    m_flags |= (VehicleFlag.HOVER_GLOBAL_HEIGHT);
                    break;
            }
        }//end SetDefaultsForType
@@ -736,28 +598,28 @@ namespace OpenSim.Region.Physics.BulletSPlugin
            }
            // Check if hovering
-            if ((m_Hoverflags & (VehicleFlag.HOVER_WATER_ONLY | VehicleFlag.HOVER_TERRAIN_ONLY | VehicleFlag.HOVER_GLOBAL_HEIGHT)) != 0)
+            if ((m_flags & (VehicleFlag.HOVER_WATER_ONLY | VehicleFlag.HOVER_TERRAIN_ONLY | VehicleFlag.HOVER_GLOBAL_HEIGHT)) != 0)
            {
                // We should hover, get the target height
-                if ((m_Hoverflags & VehicleFlag.HOVER_WATER_ONLY) != 0)
+                if ((m_flags & VehicleFlag.HOVER_WATER_ONLY) != 0)
                {
                    m_VhoverTargetHeight = m_prim.Scene.GetWaterLevel() + m_VhoverHeight;
                }
-                if ((m_Hoverflags & VehicleFlag.HOVER_TERRAIN_ONLY) != 0)
+                if ((m_flags & VehicleFlag.HOVER_TERRAIN_ONLY) != 0)
                {
                    m_VhoverTargetHeight = m_prim.Scene.GetTerrainHeightAtXY(pos.X, pos.Y) + m_VhoverHeight;
                }
-                if ((m_Hoverflags & VehicleFlag.HOVER_GLOBAL_HEIGHT) != 0)
+                if ((m_flags & VehicleFlag.HOVER_GLOBAL_HEIGHT) != 0)
                {
                    m_VhoverTargetHeight = m_VhoverHeight;
                }
-                if ((m_Hoverflags & VehicleFlag.HOVER_UP_ONLY) != 0)
+                if ((m_flags & VehicleFlag.HOVER_UP_ONLY) != 0)
                {
                    // If body is aready heigher, use its height as target height
                    if (pos.Z > m_VhoverTargetHeight) m_VhoverTargetHeight = pos.Z;
                }
-                if ((m_Hoverflags & VehicleFlag.LOCK_HOVER_HEIGHT) != 0)
+                if ((m_flags & VehicleFlag.LOCK_HOVER_HEIGHT) != 0)
                {
                    if ((pos.Z - m_VhoverTargetHeight) > .2 || (pos.Z - m_VhoverTargetHeight) < -.2)
                    {
author	Robert Adams	2012-08-15 16:49:05 -0700
committer	Robert Adams	2012-08-17 13:34:14 -0700
commit	e31e23d68d9935457ad86559bea37b2b4a63a8dc (patch)
tree	6f18a7346be0b997fbeb0fdd5c3159ec6cfe9067
parent	Merge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff)
download	opensim-SC-e31e23d68d9935457ad86559bea37b2b4a63a8dc.zip opensim-SC-e31e23d68d9935457ad86559bea37b2b4a63a8dc.tar.gz opensim-SC-e31e23d68d9935457ad86559bea37b2b4a63a8dc.tar.bz2 opensim-SC-e31e23d68d9935457ad86559bea37b2b4a63a8dc.tar.xz

diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSDynamics.cs b/OpenSim/Region/Physics/BulletSPlugin/BSDynamics.cs index 5a9f135..78bfa05 100644 --- a/OpenSim/Region/Physics/BulletSPlugin/BSDynamics.cs +++ b/OpenSim/Region/Physics/BulletSPlugin/BSDynamics.cs
@@ -74,7 +74,6 @@ namespace OpenSim.Region.Physics.BulletSPlugin
74	// HOVER_UP_ONLY	74	// HOVER_UP_ONLY
75	// LIMIT_MOTOR_UP	75	// LIMIT_MOTOR_UP
76	// LIMIT_ROLL_ONLY	76	// LIMIT_ROLL_ONLY
77	private VehicleFlag m_Hoverflags = (VehicleFlag)0;
78	private Vector3 m_BlockingEndPoint = Vector3.Zero;	77	private Vector3 m_BlockingEndPoint = Vector3.Zero;
79	private Quaternion m_RollreferenceFrame = Quaternion.Identity;	78	private Quaternion m_RollreferenceFrame = Quaternion.Identity;
80	// Linear properties	79	// Linear properties
@@ -281,157 +280,20 @@ namespace OpenSim.Region.Physics.BulletSPlugin
281	internal void ProcessVehicleFlags(int pParam, bool remove)	280	internal void ProcessVehicleFlags(int pParam, bool remove)
282	{	281	{
283	DetailLog("{0},ProcessVehicleFlags,param={1},remove={2}", m_prim.LocalID, pParam, remove);	282	DetailLog("{0},ProcessVehicleFlags,param={1},remove={2}", m_prim.LocalID, pParam, remove);
		283	VehicleFlag parm = (VehicleFlag)pParam;
284	if (remove)	284	if (remove)
285	{	285	{
286	if (pParam == -1)	286	if (pParam == -1)
287	{	287	{
288	m_flags = (VehicleFlag)0;	288	m_flags = (VehicleFlag)0;
289	m_Hoverflags = (VehicleFlag)0;
290	return;
291	}	289	}
292	if ((pParam & (int)VehicleFlag.HOVER_GLOBAL_HEIGHT) == (int)VehicleFlag.HOVER_GLOBAL_HEIGHT)	290	else
293	{
294	if ((m_Hoverflags & VehicleFlag.HOVER_GLOBAL_HEIGHT) != (VehicleFlag)0)
295	m_Hoverflags &= ~(VehicleFlag.HOVER_GLOBAL_HEIGHT);
296	}
297	if ((pParam & (int)VehicleFlag.HOVER_TERRAIN_ONLY) == (int)VehicleFlag.HOVER_TERRAIN_ONLY)
298	{
299	if ((m_Hoverflags & VehicleFlag.HOVER_TERRAIN_ONLY) != (VehicleFlag)0)
300	m_Hoverflags &= ~(VehicleFlag.HOVER_TERRAIN_ONLY);
301	}
302	if ((pParam & (int)VehicleFlag.HOVER_UP_ONLY) == (int)VehicleFlag.HOVER_UP_ONLY)
303	{
304	if ((m_Hoverflags & VehicleFlag.HOVER_UP_ONLY) != (VehicleFlag)0)
305	m_Hoverflags &= ~(VehicleFlag.HOVER_UP_ONLY);
306	}
307	if ((pParam & (int)VehicleFlag.HOVER_WATER_ONLY) == (int)VehicleFlag.HOVER_WATER_ONLY)
308	{
309	if ((m_Hoverflags & VehicleFlag.HOVER_WATER_ONLY) != (VehicleFlag)0)
310	m_Hoverflags &= ~(VehicleFlag.HOVER_WATER_ONLY);
311	}
312	if ((pParam & (int)VehicleFlag.LIMIT_MOTOR_UP) == (int)VehicleFlag.LIMIT_MOTOR_UP)
313	{
314	if ((m_flags & VehicleFlag.LIMIT_MOTOR_UP) != (VehicleFlag)0)
315	m_flags &= ~(VehicleFlag.LIMIT_MOTOR_UP);
316	}
317	if ((pParam & (int)VehicleFlag.LIMIT_ROLL_ONLY) == (int)VehicleFlag.LIMIT_ROLL_ONLY)
318	{
319	if ((m_flags & VehicleFlag.LIMIT_ROLL_ONLY) != (VehicleFlag)0)
320	m_flags &= ~(VehicleFlag.LIMIT_ROLL_ONLY);
321	}
322	if ((pParam & (int)VehicleFlag.MOUSELOOK_BANK) == (int)VehicleFlag.MOUSELOOK_BANK)
323	{
324	if ((m_flags & VehicleFlag.MOUSELOOK_BANK) != (VehicleFlag)0)
325	m_flags &= ~(VehicleFlag.MOUSELOOK_BANK);
326	}
327	if ((pParam & (int)VehicleFlag.MOUSELOOK_STEER) == (int)VehicleFlag.MOUSELOOK_STEER)
328	{
329	if ((m_flags & VehicleFlag.MOUSELOOK_STEER) != (VehicleFlag)0)
330	m_flags &= ~(VehicleFlag.MOUSELOOK_STEER);
331	}
332	if ((pParam & (int)VehicleFlag.NO_DEFLECTION_UP) == (int)VehicleFlag.NO_DEFLECTION_UP)
333	{
334	if ((m_flags & VehicleFlag.NO_DEFLECTION_UP) != (VehicleFlag)0)
335	m_flags &= ~(VehicleFlag.NO_DEFLECTION_UP);
336	}
337	if ((pParam & (int)VehicleFlag.CAMERA_DECOUPLED) == (int)VehicleFlag.CAMERA_DECOUPLED)
338	{
339	if ((m_flags & VehicleFlag.CAMERA_DECOUPLED) != (VehicleFlag)0)
340	m_flags &= ~(VehicleFlag.CAMERA_DECOUPLED);
341	}
342	if ((pParam & (int)VehicleFlag.NO_X) == (int)VehicleFlag.NO_X)
343	{
344	if ((m_flags & VehicleFlag.NO_X) != (VehicleFlag)0)
345	m_flags &= ~(VehicleFlag.NO_X);
346	}
347	if ((pParam & (int)VehicleFlag.NO_Y) == (int)VehicleFlag.NO_Y)
348	{
349	if ((m_flags & VehicleFlag.NO_Y) != (VehicleFlag)0)
350	m_flags &= ~(VehicleFlag.NO_Y);
351	}
352	if ((pParam & (int)VehicleFlag.NO_Z) == (int)VehicleFlag.NO_Z)
353	{
354	if ((m_flags & VehicleFlag.NO_Z) != (VehicleFlag)0)
355	m_flags &= ~(VehicleFlag.NO_Z);
356	}
357	if ((pParam & (int)VehicleFlag.LOCK_HOVER_HEIGHT) == (int)VehicleFlag.LOCK_HOVER_HEIGHT)
358	{
359	if ((m_Hoverflags & VehicleFlag.LOCK_HOVER_HEIGHT) != (VehicleFlag)0)
360	m_Hoverflags &= ~(VehicleFlag.LOCK_HOVER_HEIGHT);
361	}
362	if ((pParam & (int)VehicleFlag.NO_DEFLECTION) == (int)VehicleFlag.NO_DEFLECTION)
363	{
364	if ((m_flags & VehicleFlag.NO_DEFLECTION) != (VehicleFlag)0)
365	m_flags &= ~(VehicleFlag.NO_DEFLECTION);
366	}
367	if ((pParam & (int)VehicleFlag.LOCK_ROTATION) == (int)VehicleFlag.LOCK_ROTATION)
368	{	291	{
369	if ((m_flags & VehicleFlag.LOCK_ROTATION) != (VehicleFlag)0)	292	m_flags &= ~parm;
370	m_flags &= ~(VehicleFlag.LOCK_ROTATION);
371	}	293	}
372	}	294	}
373	else	295	else {
374	{	296	m_flags \|= parm;
375	if ((pParam & (int)VehicleFlag.HOVER_GLOBAL_HEIGHT) == (int)VehicleFlag.HOVER_GLOBAL_HEIGHT)
376	{
377	m_Hoverflags \|= (VehicleFlag.HOVER_GLOBAL_HEIGHT \| m_flags);
378	}
379	if ((pParam & (int)VehicleFlag.HOVER_TERRAIN_ONLY) == (int)VehicleFlag.HOVER_TERRAIN_ONLY)
380	{
381	m_Hoverflags \|= (VehicleFlag.HOVER_TERRAIN_ONLY \| m_flags);
382	}
383	if ((pParam & (int)VehicleFlag.HOVER_UP_ONLY) == (int)VehicleFlag.HOVER_UP_ONLY)
384	{
385	m_Hoverflags \|= (VehicleFlag.HOVER_UP_ONLY \| m_flags);
386	}
387	if ((pParam & (int)VehicleFlag.HOVER_WATER_ONLY) == (int)VehicleFlag.HOVER_WATER_ONLY)
388	{
389	m_Hoverflags \|= (VehicleFlag.HOVER_WATER_ONLY \| m_flags);
390	}
391	if ((pParam & (int)VehicleFlag.LIMIT_MOTOR_UP) == (int)VehicleFlag.LIMIT_MOTOR_UP)
392	{
393	m_flags \|= (VehicleFlag.LIMIT_MOTOR_UP \| m_flags);
394	}
395	if ((pParam & (int)VehicleFlag.MOUSELOOK_BANK) == (int)VehicleFlag.MOUSELOOK_BANK)
396	{
397	m_flags \|= (VehicleFlag.MOUSELOOK_BANK \| m_flags);
398	}
399	if ((pParam & (int)VehicleFlag.MOUSELOOK_STEER) == (int)VehicleFlag.MOUSELOOK_STEER)
400	{
401	m_flags \|= (VehicleFlag.MOUSELOOK_STEER \| m_flags);
402	}
403	if ((pParam & (int)VehicleFlag.NO_DEFLECTION_UP) == (int)VehicleFlag.NO_DEFLECTION_UP)
404	{
405	m_flags \|= (VehicleFlag.NO_DEFLECTION_UP \| m_flags);
406	}
407	if ((pParam & (int)VehicleFlag.CAMERA_DECOUPLED) == (int)VehicleFlag.CAMERA_DECOUPLED)
408	{
409	m_flags \|= (VehicleFlag.CAMERA_DECOUPLED \| m_flags);
410	}
411	if ((pParam & (int)VehicleFlag.NO_X) == (int)VehicleFlag.NO_X)
412	{
413	m_flags \|= (VehicleFlag.NO_X);
414	}
415	if ((pParam & (int)VehicleFlag.NO_Y) == (int)VehicleFlag.NO_Y)
416	{
417	m_flags \|= (VehicleFlag.NO_Y);
418	}
419	if ((pParam & (int)VehicleFlag.NO_Z) == (int)VehicleFlag.NO_Z)
420	{
421	m_flags \|= (VehicleFlag.NO_Z);
422	}
423	if ((pParam & (int)VehicleFlag.LOCK_HOVER_HEIGHT) == (int)VehicleFlag.LOCK_HOVER_HEIGHT)
424	{
425	m_Hoverflags \|= (VehicleFlag.LOCK_HOVER_HEIGHT);
426	}
427	if ((pParam & (int)VehicleFlag.NO_DEFLECTION) == (int)VehicleFlag.NO_DEFLECTION)
428	{
429	m_flags \|= (VehicleFlag.NO_DEFLECTION);
430	}
431	if ((pParam & (int)VehicleFlag.LOCK_ROTATION) == (int)VehicleFlag.LOCK_ROTATION)
432	{
433	m_flags \|= (VehicleFlag.LOCK_ROTATION);
434	}
435	}	297	}
436	}//end ProcessVehicleFlags	298	}//end ProcessVehicleFlags
437		299
@@ -478,10 +340,10 @@ namespace OpenSim.Region.Physics.BulletSPlugin
478	// m_bankingMix = 1;	340	// m_bankingMix = 1;
479	// m_bankingTimescale = 10;	341	// m_bankingTimescale = 10;
480	// m_referenceFrame = Quaternion.Identity;	342	// m_referenceFrame = Quaternion.Identity;
481	m_Hoverflags &=	343	m_flags \|= (VehicleFlag.NO_DEFLECTION_UP \| VehicleFlag.LIMIT_ROLL_ONLY \| VehicleFlag.LIMIT_MOTOR_UP);
		344	m_flags &=
482	~(VehicleFlag.HOVER_WATER_ONLY \| VehicleFlag.HOVER_TERRAIN_ONLY \|	345	~(VehicleFlag.HOVER_WATER_ONLY \| VehicleFlag.HOVER_TERRAIN_ONLY \|
483	VehicleFlag.HOVER_GLOBAL_HEIGHT \| VehicleFlag.HOVER_UP_ONLY);	346	VehicleFlag.HOVER_GLOBAL_HEIGHT \| VehicleFlag.HOVER_UP_ONLY);
484	m_flags \|= (VehicleFlag.NO_DEFLECTION_UP \| VehicleFlag.LIMIT_ROLL_ONLY \| VehicleFlag.LIMIT_MOTOR_UP);
485	break;	347	break;
486	case Vehicle.TYPE_CAR:	348	case Vehicle.TYPE_CAR:
487	m_linearFrictionTimescale = new Vector3(100, 2, 1000);	349	m_linearFrictionTimescale = new Vector3(100, 2, 1000);
@@ -506,10 +368,10 @@ namespace OpenSim.Region.Physics.BulletSPlugin
506	// m_bankingMix = 1;	368	// m_bankingMix = 1;
507	// m_bankingTimescale = 1;	369	// m_bankingTimescale = 1;
508	// m_referenceFrame = Quaternion.Identity;	370	// m_referenceFrame = Quaternion.Identity;
509	m_Hoverflags &= ~(VehicleFlag.HOVER_WATER_ONLY \| VehicleFlag.HOVER_TERRAIN_ONLY \| VehicleFlag.HOVER_GLOBAL_HEIGHT);
510	m_flags \|= (VehicleFlag.NO_DEFLECTION_UP \| VehicleFlag.LIMIT_ROLL_ONLY \|	371	m_flags \|= (VehicleFlag.NO_DEFLECTION_UP \| VehicleFlag.LIMIT_ROLL_ONLY \|
511	VehicleFlag.LIMIT_MOTOR_UP);	372	VehicleFlag.LIMIT_MOTOR_UP);
512	m_Hoverflags \|= (VehicleFlag.HOVER_UP_ONLY);	373	m_flags &= ~(VehicleFlag.HOVER_WATER_ONLY \| VehicleFlag.HOVER_TERRAIN_ONLY \| VehicleFlag.HOVER_GLOBAL_HEIGHT);
		374	m_flags \|= (VehicleFlag.HOVER_UP_ONLY);
513	break;	375	break;
514	case Vehicle.TYPE_BOAT:	376	case Vehicle.TYPE_BOAT:
515	m_linearFrictionTimescale = new Vector3(10, 3, 2);	377	m_linearFrictionTimescale = new Vector3(10, 3, 2);
@@ -534,12 +396,12 @@ namespace OpenSim.Region.Physics.BulletSPlugin
534	// m_bankingMix = 0.8f;	396	// m_bankingMix = 0.8f;
535	// m_bankingTimescale = 1;	397	// m_bankingTimescale = 1;
536	// m_referenceFrame = Quaternion.Identity;	398	// m_referenceFrame = Quaternion.Identity;
537	m_Hoverflags &= ~(VehicleFlag.HOVER_TERRAIN_ONLY \|	399	m_flags &= ~(VehicleFlag.HOVER_TERRAIN_ONLY \|
538	VehicleFlag.HOVER_GLOBAL_HEIGHT \| VehicleFlag.HOVER_UP_ONLY);	400	VehicleFlag.HOVER_GLOBAL_HEIGHT \| VehicleFlag.HOVER_UP_ONLY);
539	m_flags &= ~(VehicleFlag.LIMIT_ROLL_ONLY);	401	m_flags &= ~(VehicleFlag.LIMIT_ROLL_ONLY);
540	m_flags \|= (VehicleFlag.NO_DEFLECTION_UP \|	402	m_flags \|= (VehicleFlag.NO_DEFLECTION_UP \|
541	VehicleFlag.LIMIT_MOTOR_UP);	403	VehicleFlag.LIMIT_MOTOR_UP);
542	m_Hoverflags \|= (VehicleFlag.HOVER_WATER_ONLY);	404	m_flags \|= (VehicleFlag.HOVER_WATER_ONLY);
543	break;	405	break;
544	case Vehicle.TYPE_AIRPLANE:	406	case Vehicle.TYPE_AIRPLANE:
545	m_linearFrictionTimescale = new Vector3(200, 10, 5);	407	m_linearFrictionTimescale = new Vector3(200, 10, 5);
@@ -564,7 +426,7 @@ namespace OpenSim.Region.Physics.BulletSPlugin
564	// m_bankingMix = 0.7f;	426	// m_bankingMix = 0.7f;
565	// m_bankingTimescale = 2;	427	// m_bankingTimescale = 2;
566	// m_referenceFrame = Quaternion.Identity;	428	// m_referenceFrame = Quaternion.Identity;
567	m_Hoverflags &= ~(VehicleFlag.HOVER_WATER_ONLY \| VehicleFlag.HOVER_TERRAIN_ONLY \|	429	m_flags &= ~(VehicleFlag.HOVER_WATER_ONLY \| VehicleFlag.HOVER_TERRAIN_ONLY \|
568	VehicleFlag.HOVER_GLOBAL_HEIGHT \| VehicleFlag.HOVER_UP_ONLY);	430	VehicleFlag.HOVER_GLOBAL_HEIGHT \| VehicleFlag.HOVER_UP_ONLY);
569	m_flags &= ~(VehicleFlag.NO_DEFLECTION_UP \| VehicleFlag.LIMIT_MOTOR_UP);	431	m_flags &= ~(VehicleFlag.NO_DEFLECTION_UP \| VehicleFlag.LIMIT_MOTOR_UP);
570	m_flags \|= (VehicleFlag.LIMIT_ROLL_ONLY);	432	m_flags \|= (VehicleFlag.LIMIT_ROLL_ONLY);
@@ -592,11 +454,11 @@ namespace OpenSim.Region.Physics.BulletSPlugin
592	// m_bankingMix = 0.7f;	454	// m_bankingMix = 0.7f;
593	// m_bankingTimescale = 5;	455	// m_bankingTimescale = 5;
594	// m_referenceFrame = Quaternion.Identity;	456	// m_referenceFrame = Quaternion.Identity;
595	m_Hoverflags &= ~(VehicleFlag.HOVER_WATER_ONLY \| VehicleFlag.HOVER_TERRAIN_ONLY \|	457	m_flags &= ~(VehicleFlag.HOVER_WATER_ONLY \| VehicleFlag.HOVER_TERRAIN_ONLY \|
596	VehicleFlag.HOVER_UP_ONLY);	458	VehicleFlag.HOVER_UP_ONLY);
597	m_flags &= ~(VehicleFlag.NO_DEFLECTION_UP \| VehicleFlag.LIMIT_MOTOR_UP);	459	m_flags &= ~(VehicleFlag.NO_DEFLECTION_UP \| VehicleFlag.LIMIT_MOTOR_UP);
598	m_flags \|= (VehicleFlag.LIMIT_ROLL_ONLY);	460	m_flags \|= (VehicleFlag.LIMIT_ROLL_ONLY);
599	m_Hoverflags \|= (VehicleFlag.HOVER_GLOBAL_HEIGHT);	461	m_flags \|= (VehicleFlag.HOVER_GLOBAL_HEIGHT);
600	break;	462	break;
601	}	463	}
602	}//end SetDefaultsForType	464	}//end SetDefaultsForType
@@ -736,28 +598,28 @@ namespace OpenSim.Region.Physics.BulletSPlugin
736	}	598	}
737		599
738	// Check if hovering	600	// Check if hovering
739	if ((m_Hoverflags & (VehicleFlag.HOVER_WATER_ONLY \| VehicleFlag.HOVER_TERRAIN_ONLY \| VehicleFlag.HOVER_GLOBAL_HEIGHT)) != 0)	601	if ((m_flags & (VehicleFlag.HOVER_WATER_ONLY \| VehicleFlag.HOVER_TERRAIN_ONLY \| VehicleFlag.HOVER_GLOBAL_HEIGHT)) != 0)
740	{	602	{
741	// We should hover, get the target height	603	// We should hover, get the target height
742	if ((m_Hoverflags & VehicleFlag.HOVER_WATER_ONLY) != 0)	604	if ((m_flags & VehicleFlag.HOVER_WATER_ONLY) != 0)
743	{	605	{
744	m_VhoverTargetHeight = m_prim.Scene.GetWaterLevel() + m_VhoverHeight;	606	m_VhoverTargetHeight = m_prim.Scene.GetWaterLevel() + m_VhoverHeight;
745	}	607	}
746	if ((m_Hoverflags & VehicleFlag.HOVER_TERRAIN_ONLY) != 0)	608	if ((m_flags & VehicleFlag.HOVER_TERRAIN_ONLY) != 0)
747	{	609	{
748	m_VhoverTargetHeight = m_prim.Scene.GetTerrainHeightAtXY(pos.X, pos.Y) + m_VhoverHeight;	610	m_VhoverTargetHeight = m_prim.Scene.GetTerrainHeightAtXY(pos.X, pos.Y) + m_VhoverHeight;
749	}	611	}
750	if ((m_Hoverflags & VehicleFlag.HOVER_GLOBAL_HEIGHT) != 0)	612	if ((m_flags & VehicleFlag.HOVER_GLOBAL_HEIGHT) != 0)
751	{	613	{
752	m_VhoverTargetHeight = m_VhoverHeight;	614	m_VhoverTargetHeight = m_VhoverHeight;
753	}	615	}
754		616
755	if ((m_Hoverflags & VehicleFlag.HOVER_UP_ONLY) != 0)	617	if ((m_flags & VehicleFlag.HOVER_UP_ONLY) != 0)
756	{	618	{
757	// If body is aready heigher, use its height as target height	619	// If body is aready heigher, use its height as target height
758	if (pos.Z > m_VhoverTargetHeight) m_VhoverTargetHeight = pos.Z;	620	if (pos.Z > m_VhoverTargetHeight) m_VhoverTargetHeight = pos.Z;
759	}	621	}
760	if ((m_Hoverflags & VehicleFlag.LOCK_HOVER_HEIGHT) != 0)	622	if ((m_flags & VehicleFlag.LOCK_HOVER_HEIGHT) != 0)
761	{	623	{
762	if ((pos.Z - m_VhoverTargetHeight) > .2 \|\| (pos.Z - m_VhoverTargetHeight) < -.2)	624	if ((pos.Z - m_VhoverTargetHeight) > .2 \|\| (pos.Z - m_VhoverTargetHeight) < -.2)
763	{	625	{