Fix conflicts

2 files changed, 18 insertions, 5 deletions

diff --git a/OpenSim/Region/Physics/BulletDotNETPlugin/BulletDotNETCharacter.cs b/OpenSim/Region/Physics/BulletDotNETPlugin/BulletDotNETCharacter.cs
index 98681d6..88f5d3e 100644
--- a/OpenSim/Region/Physics/BulletDotNETPlugin/BulletDotNETCharacter.cs
+++ b/OpenSim/Region/Physics/BulletDotNETPlugin/BulletDotNETCharacter.cs
@@ -620,11 +620,25 @@ namespace OpenSim.Region.Physics.BulletDotNETPlugin
             set { return; }
         }
         
-        public override Quaternion APIDTarget { set { return; } }
-        public override bool APIDActive { set { return; } }
-        public override float APIDStrength { set { return; } }
-        public override float APIDDamping { set { return; } }
+        public override Quaternion APIDTarget 
+        { 
+                set { return; }
+        }
+        
+        public override bool APIDActive
+        { 
+                set { return; }
+        }
         
+        public override float APIDStrength
+        { 
+                set { return; }
+        }
+        
+        public override float APIDDamping
+        { 
+                set { return; }
+        }
 
         /// <summary>
         /// Adds the force supplied to the Target Velocity
diff --git a/OpenSim/Region/Physics/BulletDotNETPlugin/BulletDotNETPrim.cs b/OpenSim/Region/Physics/BulletDotNETPlugin/BulletDotNETPrim.cs
index d931f126..9603ea4 100644
--- a/OpenSim/Region/Physics/BulletDotNETPlugin/BulletDotNETPrim.cs
+++ b/OpenSim/Region/Physics/BulletDotNETPlugin/BulletDotNETPrim.cs
@@ -570,7 +570,6 @@ namespace OpenSim.Region.Physics.BulletDotNETPlugin
         public override float APIDStrength { set { return; } }
         public override float APIDDamping { set { return; } }
         
-
         public override void AddForce(Vector3 force, bool pushforce)
         {
             m_forcelist.Add(force);