10 files changed, 35 insertions, 51 deletions

diff --git a/OpenSim/Region/Physics/ChOdePlugin/ODECharacter.cs b/OpenSim/Region/Physics/ChOdePlugin/ODECharacter.cs
index ec717d7..e7a39eb 100644
--- a/OpenSim/Region/Physics/ChOdePlugin/ODECharacter.cs
+++ b/OpenSim/Region/Physics/ChOdePlugin/ODECharacter.cs
@@ -1288,7 +1288,7 @@ namespace OpenSim.Region.Physics.OdePlugin
         }
 
         public override Vector3 PIDTarget { set { return; } }
-        public override bool PIDActive { set { return; } }
+        public override bool PIDActive { get { return m_pidControllerActive; } set { return; } }
         public override float PIDTau { set { return; } }
 
         public override float PIDHoverHeight { set { return; } }
diff --git a/OpenSim/Region/Physics/ChOdePlugin/ODEPrim.cs b/OpenSim/Region/Physics/ChOdePlugin/ODEPrim.cs
index ba24aa7..b283152 100644
--- a/OpenSim/Region/Physics/ChOdePlugin/ODEPrim.cs
+++ b/OpenSim/Region/Physics/ChOdePlugin/ODEPrim.cs
@@ -748,7 +748,7 @@ namespace OpenSim.Region.Physics.OdePlugin
                     m_log.Warn("[PHYSICS]: Got NaN PIDTarget from Scene on Object");
             }
         }
-        public override bool PIDActive { set { m_usePID = value; } }
+        public override bool PIDActive { get { return m_usePID; } set { m_usePID = value; } }
         public override float PIDTau { set { m_PIDTau = value; } }
 
         // For RotLookAt        
diff --git a/OpenSim/Region/Physics/ChOdePlugin/OdePlugin.cs b/OpenSim/Region/Physics/ChOdePlugin/OdePlugin.cs
index 00f5122..00baa21 100644
--- a/OpenSim/Region/Physics/ChOdePlugin/OdePlugin.cs
+++ b/OpenSim/Region/Physics/ChOdePlugin/OdePlugin.cs
@@ -1667,6 +1667,11 @@ namespace OpenSim.Region.Physics.OdePlugin
 
         #region Add/Remove Entities
 
+        public override PhysicsActor AddAvatar(string avName, Vector3 position, Vector3 velocity, Vector3 size, bool isFlying)
+        {
+            return AddAvatar(avName, position, size, isFlying);
+        }
+
         public override PhysicsActor AddAvatar(string avName, Vector3 position, Vector3 size, bool isFlying)
         {
             Vector3 pos;
diff --git a/OpenSim/Region/Physics/Manager/PhysicsScene.cs b/OpenSim/Region/Physics/Manager/PhysicsScene.cs
index 96ef0a6..eb7e8fc 100644
--- a/OpenSim/Region/Physics/Manager/PhysicsScene.cs
+++ b/OpenSim/Region/Physics/Manager/PhysicsScene.cs
@@ -152,16 +152,16 @@ namespace OpenSim.Region.Physics.Manager
         /// <param name="size"></param>
         /// <param name="isFlying"></param>
         /// <returns></returns>
-<<<<<<< HEAD
+
         public abstract PhysicsActor AddAvatar(
             string avName, Vector3 position, Vector3 velocity, Vector3 size, bool isFlying);
 
-=======
+
         public virtual PhysicsActor AddAvatar(string avName, Vector3 position, Vector3 size, bool isFlying)
         {
             return null;
         }
->>>>>>> avn/ubitvar
+
         /// <summary>
         /// Add an avatar
         /// </summary>
@@ -177,13 +177,25 @@ namespace OpenSim.Region.Physics.Manager
         {
             PhysicsActor ret = AddAvatar(avName, position, velocity, size, isFlying);
 
-            if (ret != null) 
+            if (ret != null)
+                ret.LocalID = localID;
+
+            return ret;
+        }
+
+        public virtual PhysicsActor AddAvatar(
+            uint localID, string avName, Vector3 position, Vector3 size, bool isFlying)
+        {
+            PhysicsActor ret = AddAvatar(avName, position, size, isFlying);
+
+            if (ret != null)
                 ret.LocalID = localID;
 
             return ret;
         }
 
-        public virtual PhysicsActor AddAvatar(uint localID, string avName, Vector3 position, Vector3 size, float feetOffset, bool isFlying)
+        public virtual PhysicsActor AddAvatar(
+            uint localID, string avName, Vector3 position, Vector3 size, float feetOffset, bool isFlying)
         {
             PhysicsActor ret = AddAvatar(localID, avName, position, size, isFlying);
             return ret;
diff --git a/OpenSim/Region/Physics/OdePlugin/ODECharacter.cs b/OpenSim/Region/Physics/OdePlugin/ODECharacter.cs
index 9203169..05eaf2a 100644
--- a/OpenSim/Region/Physics/OdePlugin/ODECharacter.cs
+++ b/OpenSim/Region/Physics/OdePlugin/ODECharacter.cs
@@ -1251,12 +1251,7 @@ namespace OpenSim.Region.Physics.OdePlugin
         public override Vector3 PIDTarget { set { return; } }
         public override bool PIDActive 
         { 
-<<<<<<< HEAD
             get { return false; }
-=======
-            // os version
-            // get { return false; }
->>>>>>> avn/ubitvar
             set { return; } 
         }
         public override float PIDTau { set { return; } }
diff --git a/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs b/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs
index 6363422..0a99e30 100644
--- a/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs
+++ b/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs
@@ -2955,14 +2955,8 @@ Console.WriteLine(" JointCreateFixed");
                     m_log.WarnFormat("[PHYSICS]: Got NaN PIDTarget from Scene on Object {0}", Name);
             } 
         }
-<<<<<<< HEAD
-        public override bool PIDActive { get; set; }
-=======
-        // os version
-        //public override bool PIDActive {get { return m_usePID; } set { m_usePID = value; } }
-        public override bool PIDActive { set { m_usePID = value; } }
 
->>>>>>> avn/ubitvar
+        public override bool PIDActive { get; set; }
         public override float PIDTau { set { m_PIDTau = value; } }
 
         public override float PIDHoverHeight { set { m_PIDHoverHeight = value; ; } }
@@ -3359,14 +3353,7 @@ Console.WriteLine(" JointCreateFixed");
                         RequestAssetDelegate assetProvider = _parent_scene.RequestAssetMethod;
                         if (assetProvider != null)
                             assetProvider(_pbs.SculptTexture, MeshAssetReceived);
-<<<<<<< HEAD
                     }, null, "ODEPrim.CheckMeshAsset");
-=======
-                    // os version
-                    //}, null, "ODEPrim.CheckMeshAsset");
-                    // avn
-                    });
->>>>>>> avn/ubitvar
             }
         }
 
diff --git a/OpenSim/Region/Physics/OdePlugin/OdeScene.cs b/OpenSim/Region/Physics/OdePlugin/OdeScene.cs
index 7f4a809..3776ac9 100644
--- a/OpenSim/Region/Physics/OdePlugin/OdeScene.cs
+++ b/OpenSim/Region/Physics/OdePlugin/OdeScene.cs
@@ -2020,35 +2020,11 @@ namespace OpenSim.Region.Physics.OdePlugin
 
         #region Add/Remove Entities
 
-<<<<<<< HEAD
         public override PhysicsActor AddAvatar(string avName, Vector3 position, Vector3 velocity, Vector3 size, bool isFlying)
         {                       
             OdeCharacter newAv
                 = new OdeCharacter(
                     avName, this, position, velocity, size, avPIDD, avPIDP,
-=======
-/*  core version
-        public override PhysicsActor AddAvatar(string avName, Vector3 position, Vector3 velocity, Vector3 size, bool isFlying)
-        {                       
-            OdeCharacter newAv
-                = new OdeCharacter(
-                    avName, this, position, velocity, size, avPIDD, avPIDP,
-                    avCapRadius, avStandupTensor, avDensity,
-                    avMovementDivisorWalk, avMovementDivisorRun);
-
-            newAv.Flying = isFlying;
-            newAv.MinimumGroundFlightOffset = minimumGroundFlightOffset;
-            newAv.m_avatarplanted = avplanted;
-
-            return newAv;
-        }
-*/
-        public override PhysicsActor AddAvatar(string avName, Vector3 position, Vector3 size, bool isFlying)
-        {
-            OdeCharacter newAv
-                = new OdeCharacter(
-                    avName, this, position, Vector3.Zero, size, avPIDD, avPIDP,
->>>>>>> avn/ubitvar
                     avCapRadius, avStandupTensor, avDensity,
                     avMovementDivisorWalk, avMovementDivisorRun);
 
diff --git a/OpenSim/Region/Physics/UbitOdePlugin/ODECharacter.cs b/OpenSim/Region/Physics/UbitOdePlugin/ODECharacter.cs
index 1c38246..0e2cbd2 100644
--- a/OpenSim/Region/Physics/UbitOdePlugin/ODECharacter.cs
+++ b/OpenSim/Region/Physics/UbitOdePlugin/ODECharacter.cs
@@ -1415,7 +1415,7 @@ namespace OpenSim.Region.Physics.OdePlugin
         }
 
         public override Vector3 PIDTarget { set { return; } }
-        public override bool PIDActive { set { return; } }
+        public override bool PIDActive {get {return m_pidControllerActive;} set { return; } }
         public override float PIDTau { set { return; } }
 
         public override float PIDHoverHeight { set { return; } }
diff --git a/OpenSim/Region/Physics/UbitOdePlugin/ODEPrim.cs b/OpenSim/Region/Physics/UbitOdePlugin/ODEPrim.cs
index b13f601..8bcdd89 100644
--- a/OpenSim/Region/Physics/UbitOdePlugin/ODEPrim.cs
+++ b/OpenSim/Region/Physics/UbitOdePlugin/ODEPrim.cs
@@ -716,6 +716,10 @@ namespace OpenSim.Region.Physics.OdePlugin
 

         public override bool PIDActive

         {

+            get

+            {

+                return m_usePID;

+            }

             set

             {

                 AddChange(changes.PIDActive,value);

diff --git a/OpenSim/Region/Physics/UbitOdePlugin/OdeScene.cs b/OpenSim/Region/Physics/UbitOdePlugin/OdeScene.cs
index dafd3a3..26e8e54 100644
--- a/OpenSim/Region/Physics/UbitOdePlugin/OdeScene.cs
+++ b/OpenSim/Region/Physics/UbitOdePlugin/OdeScene.cs
@@ -1222,6 +1222,11 @@ namespace OpenSim.Region.Physics.OdePlugin
 
         #region Add/Remove Entities
 
+        public override PhysicsActor AddAvatar(string avName, Vector3 position, Vector3 velocity, Vector3 size, bool isFlying)
+        {
+            return AddAvatar(avName, position, size, isFlying);
+        }
+
         public override PhysicsActor AddAvatar(uint localID, string avName, Vector3 position, Vector3 size, float feetOffset, bool isFlying)
         {
             Vector3 pos;