Merge branch 'master' into careminster

OpenSim/Region/Physics/BulletSPlugin/BSCharacter.cs

@@ -274,11 +274,14 @@ public class BSCharacter : PhysicsActor
     public override bool Flying { 
         get { return _flying; } 
         set {
+            if (_flying != value)
+            {
                 _flying = value;
                 // simulate flying by changing the effect of gravity
                 this.Buoyancy = ComputeBuoyancyFromFlying(_flying);
             }
         } 
+    }
     private float ComputeBuoyancyFromFlying(bool ifFlying) {
         return ifFlying ? 1f : 0f;
     }

OpenSim/Region/Physics/BulletSPlugin/BSScene.cs

@@ -352,7 +352,7 @@ public class BSScene : PhysicsScene, IPhysicsParameters
         BSPrim bsprim = prim as BSPrim;
         if (bsprim != null)
         {
-            m_log.DebugFormat("{0}: RemovePrim. id={1}/{2}", LogHeader, bsprim.Name, bsprim.LocalID);
+            // m_log.DebugFormat("{0}: RemovePrim. id={1}/{2}", LogHeader, bsprim.Name, bsprim.LocalID);
             try
             {
                 lock (m_prims) m_prims.Remove(bsprim.LocalID);