5 files changed, 28 insertions, 9 deletions

diff --git a/OpenSim/Region/Physics/Manager/AssemblyInfo.cs b/OpenSim/Region/Physics/Manager/AssemblyInfo.cs
index 10e850e..33f60e4 100644
--- a/OpenSim/Region/Physics/Manager/AssemblyInfo.cs
+++ b/OpenSim/Region/Physics/Manager/AssemblyInfo.cs
@@ -55,4 +55,4 @@ using System.Runtime.InteropServices;
 // You can specify all values by your own or you can build default build and revision
 // numbers with the '*' character (the default):
 
-[assembly : AssemblyVersion("0.8.0.*")]
+[assembly : AssemblyVersion("0.8.2.*")]
diff --git a/OpenSim/Region/Physics/Manager/NullPhysicsScene.cs b/OpenSim/Region/Physics/Manager/NullPhysicsScene.cs
index 1ccf46d..b52f1f6 100644
--- a/OpenSim/Region/Physics/Manager/NullPhysicsScene.cs
+++ b/OpenSim/Region/Physics/Manager/NullPhysicsScene.cs
@@ -45,7 +45,8 @@ namespace OpenSim.Region.Physics.Manager
             // Does nothing right now
         }
 
-        public override PhysicsActor AddAvatar(string avName, Vector3 position, Vector3 size, bool isFlying)
+        public override PhysicsActor AddAvatar(
+            string avName, Vector3 position, Vector3 velocity, Vector3 size, bool isFlying)
         {
             m_log.InfoFormat("[PHYSICS]: NullPhysicsScene : AddAvatar({0})", position);
             return PhysicsActor.Null;
diff --git a/OpenSim/Region/Physics/Manager/PhysicsActor.cs b/OpenSim/Region/Physics/Manager/PhysicsActor.cs
index 44bfd42..60f6480 100644
--- a/OpenSim/Region/Physics/Manager/PhysicsActor.cs
+++ b/OpenSim/Region/Physics/Manager/PhysicsActor.cs
@@ -386,7 +386,7 @@ namespace OpenSim.Region.Physics.Manager
 
         // Used for MoveTo
         public abstract Vector3 PIDTarget { set; }
-        public abstract bool  PIDActive { set;}
+        public abstract bool PIDActive { get; set; }
         public abstract float PIDTau { set; }
 
         // Used for llSetHoverHeight and maybe vehicle height
@@ -611,7 +611,13 @@ namespace OpenSim.Region.Physics.Manager
         }
 
         public override Vector3 PIDTarget { set { return; } }
-        public override bool PIDActive { set { return; } }
+
+        public override bool PIDActive 
+        {
+            get { return false; }
+            set { return; } 
+        }
+
         public override float PIDTau { set { return; } }
 
         public override float PIDHoverHeight { set { return; } }
diff --git a/OpenSim/Region/Physics/Manager/PhysicsPluginManager.cs b/OpenSim/Region/Physics/Manager/PhysicsPluginManager.cs
index d14edfd..ddbe80b 100644
--- a/OpenSim/Region/Physics/Manager/PhysicsPluginManager.cs
+++ b/OpenSim/Region/Physics/Manager/PhysicsPluginManager.cs
@@ -180,7 +180,7 @@ namespace OpenSim.Region.Physics.Manager
                         {
                             if (!pluginType.IsAbstract)
                             {
-                                Type physTypeInterface = pluginType.GetInterface("IPhysicsPlugin", true);
+                                Type physTypeInterface = pluginType.GetInterface("IPhysicsPlugin");
 
                                 if (physTypeInterface != null)
                                 {
@@ -194,7 +194,7 @@ namespace OpenSim.Region.Physics.Manager
                                     }
                                 }
 
-                                Type meshTypeInterface = pluginType.GetInterface("IMeshingPlugin", true);
+                                Type meshTypeInterface = pluginType.GetInterface("IMeshingPlugin");
 
                                 if (meshTypeInterface != null)
                                 {
diff --git a/OpenSim/Region/Physics/Manager/PhysicsScene.cs b/OpenSim/Region/Physics/Manager/PhysicsScene.cs
index 4f4ff07..96ef0a6 100644
--- a/OpenSim/Region/Physics/Manager/PhysicsScene.cs
+++ b/OpenSim/Region/Physics/Manager/PhysicsScene.cs
@@ -148,26 +148,38 @@ namespace OpenSim.Region.Physics.Manager
         /// </summary>
         /// <param name="avName"></param>
         /// <param name="position"></param>
+        /// <param name="velocity"></param>
         /// <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>
         /// <param name="localID"></param>
         /// <param name="avName"></param>
         /// <param name="position"></param>
+        /// <param name="velocity"></param>
         /// <param name="size"></param>
         /// <param name="isFlying"></param>
         /// <returns></returns>
-        public virtual PhysicsActor AddAvatar(uint localID, string avName, Vector3 position, Vector3 size, bool isFlying)
+        public virtual PhysicsActor AddAvatar(
+            uint localID, string avName, Vector3 position, Vector3 velocity, Vector3 size, bool isFlying)
         {
-            PhysicsActor ret = AddAvatar(avName, position, size, isFlying);
-            if (ret != null) ret.LocalID = localID;
+            PhysicsActor ret = AddAvatar(avName, position, velocity, size, isFlying);
+
+            if (ret != null) 
+                ret.LocalID = localID;
+
             return ret;
         }