Merge branch 'master' into careminster

OpenSim/Region/Physics/BulletSPlugin/BSCharacter.cs

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

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);