Merge branch 'master' into careminster

4 files changed, 24 insertions, 22 deletions

diff --git a/OpenSim/Region/Framework/Scenes/Animation/ScenePresenceAnimator.cs b/OpenSim/Region/Framework/Scenes/Animation/ScenePresenceAnimator.cs
index eda085f..3584cda 100644
--- a/OpenSim/Region/Framework/Scenes/Animation/ScenePresenceAnimator.cs
+++ b/OpenSim/Region/Framework/Scenes/Animation/ScenePresenceAnimator.cs
@@ -61,11 +61,12 @@ namespace OpenSim.Region.Framework.Scenes.Animation
         public bool m_jumping = false; 
         public float m_jumpVelocity = 0f;
 //        private int m_landing = 0;
-        public bool Falling
-        {
-            get { return m_falling; }
-        }
-        private bool m_falling = false;
+
+        /// <summary>
+        /// Is the avatar falling?
+        /// </summary>
+        public bool Falling { get; private set; }
+
         private float m_fallHeight;
 
         /// <value>
@@ -223,7 +224,7 @@ namespace OpenSim.Region.Framework.Scenes.Animation
                 m_animTickFall = 0;
                 m_animTickJump = 0;
                 m_jumping = false;
-                m_falling = true;
+                Falling = false;
                 m_jumpVelocity = 0f;
                 actor.Selected = false;
                 m_fallHeight = actor.Position.Z;    // save latest flying height
@@ -238,10 +239,8 @@ namespace OpenSim.Region.Framework.Scenes.Animation
                 }
                 else if (move.Z < 0f)
                 {
-                    if (actor != null && actor.IsColliding) 
-                    {
+                    if (actor != null && actor.IsColliding)
                         return "LAND";
-                }
                     else
                         return "HOVER_DOWN";
                 }
@@ -260,7 +259,8 @@ namespace OpenSim.Region.Framework.Scenes.Animation
                 float fallElapsed = (float)(Environment.TickCount - m_animTickFall);
                 float fallVelocity = (actor != null) ? actor.Velocity.Z : 0.0f;
 
-                if (!m_jumping && (fallVelocity < -3.0f) ) m_falling = true;
+                if (!m_jumping && (fallVelocity < -3.0f))
+                    Falling = true;
 
                 if (m_animTickFall == 0 || (fallVelocity >= 0.0f))
                 {
@@ -290,20 +290,20 @@ namespace OpenSim.Region.Framework.Scenes.Animation
                 // Start jumping, prejump
                 m_animTickFall = 0;
                 m_jumping = true;
-                m_falling = false;
+                Falling = false;
                 actor.Selected = true;      // borrowed for jumping flag
                 m_animTickJump = Environment.TickCount;
                 m_jumpVelocity = 0.35f;
                 return "PREJUMP";
             }
 
-            if(m_jumping)
+            if (m_jumping)
             {
-                if ( (jumptime > (JUMP_PERIOD * 1.5f)) && actor.IsColliding)
+                if ((jumptime > (JUMP_PERIOD * 1.5f)) && actor.IsColliding)
                 {
                     // end jumping
                     m_jumping = false;
-                    m_falling = false;
+                    Falling = false;
                     actor.Selected = false;      // borrowed for jumping flag
                     m_jumpVelocity = 0f;
                     m_animTickFall = Environment.TickCount;
@@ -330,7 +330,7 @@ namespace OpenSim.Region.Framework.Scenes.Animation
 
             if (CurrentMovementAnimation == "FALLDOWN")
             {
-                m_falling = false;
+                Falling = false;
                 m_animTickFall = Environment.TickCount;
                 // TODO: SOFT_LAND support
                 float fallHeight = m_fallHeight - actor.Position.Z;
@@ -364,7 +364,7 @@ namespace OpenSim.Region.Framework.Scenes.Animation
             if (move.X != 0f || move.Y != 0f)
             {
                 m_fallHeight = actor.Position.Z;    // save latest flying height
-                m_falling = false;
+                Falling = false;
                 // Walking / crouchwalking / running
                 if (move.Z < 0f)
                     return "CROUCHWALK";
@@ -375,7 +375,7 @@ namespace OpenSim.Region.Framework.Scenes.Animation
             }
             else if (!m_jumping)
             {
-                m_falling = false;
+                Falling = false;
                 // Not walking
                 if (move.Z < 0)
                     return "CROUCH";
@@ -388,7 +388,7 @@ namespace OpenSim.Region.Framework.Scenes.Animation
             }
             #endregion Ground Movement
 
-            m_falling = false;
+            Falling = false;
 
             return CurrentMovementAnimation;
         }
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index a301ccb..1232d0c 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -1282,8 +1282,8 @@ namespace OpenSim.Region.Framework.Scenes
         public void HandleAgentUpdate(IClientAPI remoteClient, AgentUpdateArgs agentData)
         {
 //            m_log.DebugFormat(
-//                "[SCENE PRESENCE]: In {0} received agent update from {1}",
-//                Scene.RegionInfo.RegionName, remoteClient.Name);
+//                "[SCENE PRESENCE]: In {0} received agent update from {1}, flags {2}",
+//                Scene.RegionInfo.RegionName, remoteClient.Name, agentData.ControlFlags);
 
             if (IsChildAgent)
             {
@@ -2323,6 +2323,8 @@ namespace OpenSim.Region.Framework.Scenes
         /// <param name="vec">The vector in which to move.  This is relative to the rotation argument</param>
         public void AddNewMovement(Vector3 vec)
         {
+//            m_log.DebugFormat("[SCENE PRESENCE]: Adding new movement {0} for {1}", vec, Name);
+
             Vector3 direc = vec * Rotation;
             direc.Normalize();
 
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
index 40dd4ed..8999f00 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
@@ -2094,7 +2094,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
 
         public LSL_Key osNpcCreate(string firstname, string lastname, LSL_Vector position, string notecard)
         {
-            CheckThreatLevel(ThreatLevel.High, "osNpcCreated");
+            CheckThreatLevel(ThreatLevel.High, "osNpcCreate");
             return NpcCreate(firstname, lastname, position, notecard, false);
         }
 
diff --git a/OpenSim/Services/Connectors/Hypergrid/HeloServiceConnector.cs b/OpenSim/Services/Connectors/Hypergrid/HeloServiceConnector.cs
index c030bca..5c50936 100644
--- a/OpenSim/Services/Connectors/Hypergrid/HeloServiceConnector.cs
+++ b/OpenSim/Services/Connectors/Hypergrid/HeloServiceConnector.cs
@@ -66,7 +66,7 @@ namespace OpenSim.Services.Connectors
                         m_ServerURI = m_ServerURI.TrimEnd('/') + "/helo/";
                     }
                 }
-                catch (UriFormatException e)
+                catch (UriFormatException)
                 {
                     m_log.WarnFormat("[HELO SERVICE]: Malformed URL {0}", serverURI);
                 }