Merge branch 'master' of ssh://opensimulator.org/var/git/opensim

OpenSim/Region/Framework/Scenes/ScenePresence.cs

@@ -2530,10 +2530,7 @@ namespace OpenSim.Region.Framework.Scenes
             // again here... this comes after the cached appearance check because the avatars
             // appearance goes into the avatar update packet
             SendAvatarDataToAllAgents();
-
+            SendAppearanceToAgent(this);
-            // Sending us our own appearance does not seem to be necessary, and the viewer warns in the log if you do
-            // this.
-//            SendAppearanceToAgent(this);
 
             // If we are using the the cached appearance then send it out to everyone
             if (cachedappearance)

OpenSim/Region/Physics/BasicPhysicsPlugin/BasicPhysicsActor.cs

@@ -233,6 +233,7 @@ namespace OpenSim.Region.Physics.BasicPhysicsPlugin
         public override Vector3 Acceleration
         {
             get { return _acceleration; }
+            set { _acceleration = value; }
         }
 
         public override bool Kinematic
@@ -253,11 +254,6 @@ namespace OpenSim.Region.Physics.BasicPhysicsPlugin
         {
         }
 
-        public void SetAcceleration(Vector3 accel)
-        {
-            _acceleration = accel;
-        }
-
         public override void AddForce(Vector3 force, bool pushforce)
         {
         }

OpenSim/Region/Physics/BulletSPlugin/BSCharacter.cs

@@ -232,6 +232,7 @@ public class BSCharacter : PhysicsActor
     }
     public override Vector3 Acceleration { 
         get { return _acceleration; }
+        set { _acceleration = value; }
     }
     public override Quaternion Orientation { 
         get { return _orientation; } 

OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs

@@ -418,6 +418,7 @@ public sealed class BSPrim : PhysicsActor
     }
     public override OMV.Vector3 Acceleration { 
         get { return _acceleration; }
+        set { _acceleration = value; }
     }
     public override OMV.Quaternion Orientation { 
         get { return _orientation; } 

OpenSim/Region/Physics/Manager/PhysicsActor.cs

@@ -261,7 +261,7 @@ namespace OpenSim.Region.Physics.Manager
 
         public abstract Vector3 Torque { get; set; }
         public abstract float CollisionScore { get; set;}
-        public abstract Vector3 Acceleration { get; }
+        public abstract Vector3 Acceleration { get; set; }
         public abstract Quaternion Orientation { get; set; }
         public abstract int PhysicsActorType { get; set; }
         public abstract bool IsPhysical { get; set; }
@@ -458,6 +458,7 @@ namespace OpenSim.Region.Physics.Manager
         public override Vector3 Acceleration
         {
             get { return Vector3.Zero; }
+            set { }
         }
 
         public override bool IsPhysical

OpenSim/Region/Physics/OdePlugin/ODECharacter.cs

@@ -690,12 +690,7 @@ namespace OpenSim.Region.Physics.OdePlugin
         public override Vector3 Acceleration
         {
             get { return _acceleration; }
-        }
+            set { _acceleration = value; }
-
-        public void SetAcceleration(Vector3 accel)
-        {
-            m_pidControllerActive = true;
-            _acceleration = accel;
         }
 
         /// <summary>

OpenSim/Region/Physics/OdePlugin/ODEPrim.cs

@@ -2497,6 +2497,7 @@ Console.WriteLine(" JointCreateFixed");
         public override Vector3 Acceleration
         {
             get { return _acceleration; }
+            set { _acceleration = value; }
         }
 
         public override void AddForce(Vector3 force, bool pushforce)

OpenSim/Region/Physics/POSPlugin/POSCharacter.cs

@@ -231,6 +231,7 @@ namespace OpenSim.Region.Physics.POSPlugin
         public override Vector3 Acceleration
         {
             get { return _acceleration; }
+            set { _acceleration = value; }
         }
 
         public override bool Kinematic
@@ -251,11 +252,6 @@ namespace OpenSim.Region.Physics.POSPlugin
         {
         }
 
-        public void SetAcceleration(Vector3 accel)
-        {
-            _acceleration = accel;
-        }
-
         public override void AddForce(Vector3 force, bool pushforce)
         {
         }

OpenSim/Region/Physics/POSPlugin/POSPrim.cs

@@ -193,6 +193,7 @@ namespace OpenSim.Region.Physics.POSPlugin
         public override Vector3 Acceleration
         {
             get { return _acceleration; }
+            set { _acceleration = value; }
         }
 
         public override bool Kinematic
@@ -201,11 +202,6 @@ namespace OpenSim.Region.Physics.POSPlugin
             set { }
         }
 
-        public void SetAcceleration(Vector3 accel)
-        {
-            _acceleration = accel;
-        }
-
         public override void AddForce(Vector3 force, bool pushforce)
         {
         }

OpenSim/Region/Physics/PhysXPlugin/PhysXCharacter.cs

@@ -233,11 +233,7 @@ namespace OpenSim.Region.Physics.PhysXPlugin
         public override Vector3 Acceleration
         {
             get { return _acceleration; }
-        }
+            set { _acceleration = value; }
-
-        public void SetAcceleration(Vector3 accel)
-        {
-            _acceleration = accel;
         }
 
         public override void AddForce(Vector3 force, bool pushforce)

OpenSim/Region/Physics/PhysXPlugin/PhysXPrim.cs

@@ -207,11 +207,7 @@ namespace OpenSim.Region.Physics.PhysXPlugin
         public override Vector3 Acceleration
         {
             get { return _acceleration; }
-        }
+            set { _acceleration = value; }
-
-        public void SetAcceleration(Vector3 accel)
-        {
-            _acceleration = accel;
         }
 
         public override void AddForce(Vector3 force, bool pushforce)