2 files changed, 91 insertions, 49 deletions

diff --git a/OpenSim/Region/Framework/Scenes/Animation/ScenePresenceAnimator.cs b/OpenSim/Region/Framework/Scenes/Animation/ScenePresenceAnimator.cs
index ba11800..b031f61 100644
--- a/OpenSim/Region/Framework/Scenes/Animation/ScenePresenceAnimator.cs
+++ b/OpenSim/Region/Framework/Scenes/Animation/ScenePresenceAnimator.cs
@@ -53,8 +53,8 @@ namespace OpenSim.Region.Framework.Scenes.Animation
         {
             get { return m_movementAnimation; }
         }
-        protected string m_movementAnimation = "DEFAULT";
-
+ //       protected string m_movementAnimation = "DEFAULT";     //KF: 'DEFAULT' does not exist!
+        protected string m_movementAnimation = "CROUCH";                //KF: CROUCH ensures reliable Av Anim. init.
         private int m_animTickFall;
         private int m_animTickJump;
         
@@ -123,17 +123,22 @@ namespace OpenSim.Region.Framework.Scenes.Animation
         /// </summary>
         public void TrySetMovementAnimation(string anim)
         {
-            //m_log.DebugFormat("Updating movement animation to {0}", anim);
+//Console.WriteLine("Updating movement animation to {0}", anim);
 
             if (!m_scenePresence.IsChildAgent)
             {
                 if (m_animations.TrySetDefaultAnimation(
                     anim, m_scenePresence.ControllingClient.NextAnimationSequenceNumber, UUID.Zero))
                 {
+//Console.WriteLine("TSMA {0} success.", anim);    
                     // 16384 is CHANGED_ANIMATION
                     m_scenePresence.SendScriptEventToAttachments("changed", new Object[] { 16384 });
                     SendAnimPack();
                 }
+                else
+                {
+//Console.WriteLine("TSMA {0} fail.", anim);                   
+                                }
             }
         }
 
@@ -312,7 +317,7 @@ namespace OpenSim.Region.Framework.Scenes.Animation
         public void UpdateMovementAnimations()
         {
             m_movementAnimation = GetMovementAnimation();
-
+//Console.WriteLine("UMA got {0}", m_movementAnimation);
             if (m_movementAnimation == "PREJUMP" && !m_scenePresence.Scene.m_usePreJump)
             {
                 // This was the previous behavior before PREJUMP
@@ -444,4 +449,4 @@ namespace OpenSim.Region.Framework.Scenes.Animation
             SendAnimPack(animIDs, sequenceNums, objectIDs);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index a1bb244..cebd108 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -90,6 +90,7 @@ namespace OpenSim.Region.Framework.Scenes
         /// issue #1716
         /// </summary>
 //        private static readonly Vector3 SIT_TARGET_ADJUSTMENT = new Vector3(0.1f, 0.0f, 0.3f);
+                // Value revised by KF 091121 by comparison with SL.
         private static readonly Vector3 SIT_TARGET_ADJUSTMENT = new Vector3(0.0f, 0.0f, 0.418f);
 
         public UUID currentParcelUUID = UUID.Zero;
@@ -116,6 +117,7 @@ namespace OpenSim.Region.Framework.Scenes
         public Vector4 CollisionPlane = Vector4.UnitW;
         
                 private Vector3 m_avInitialPos;         // used to calculate unscripted sit rotation
+                private Vector3 m_avUnscriptedSitPos;   // for non-scripted prims
         private Vector3 m_lastPosition;
         private Quaternion m_lastRotation;
         private Vector3 m_lastVelocity;
@@ -205,6 +207,9 @@ namespace OpenSim.Region.Framework.Scenes
         private bool m_followCamAuto;
 
         private int m_movementUpdateCount;
+        private int m_lastColCount = -1;                //KF: Look for Collision chnages
+        private int m_updateCount = 0;                  //KF: Update Anims for a while
+        private static readonly int UPDATE_COUNT = 10;          // how many frames to update for
 
         private const int NumMovementsBetweenRayCast = 5;
 
@@ -664,9 +669,7 @@ namespace OpenSim.Region.Framework.Scenes
 
             AdjustKnownSeeds();
 
-            // TODO: I think, this won't send anything, as we are still a child here...
-            Animator.TrySetMovementAnimation("STAND"); 
-
+           Animator.TrySetMovementAnimation("STAND"); 
             // we created a new ScenePresence (a new child agent) in a fresh region.
             // Request info about all the (root) agents in this region
             // Note: This won't send data *to* other clients in that region (children don't send)
@@ -1026,7 +1029,9 @@ namespace OpenSim.Region.Framework.Scenes
             {
                 AbsolutePosition = AbsolutePosition + new Vector3(0f, 0f, (1.56f / 6f));
             }
-
+            
+            m_updateCount = UPDATE_COUNT;                               //KF: Trigger Anim updates to catch falling anim. 
+            
             ControllingClient.SendAvatarTerseUpdate(new SendAvatarTerseData(m_rootRegionHandle, (ushort)(m_scene.TimeDilation * ushort.MaxValue), LocalId,
                     AbsolutePosition, Velocity, Vector3.Zero, m_bodyRot, new Vector4(0,0,1,AbsolutePosition.Z - 0.5f), m_uuid, null, GetUpdatePriority(ControllingClient)));
         }
@@ -1274,9 +1279,7 @@ namespace OpenSim.Region.Framework.Scenes
 
             if ((flags & AgentManager.ControlFlags.AGENT_CONTROL_SIT_ON_GROUND) != 0)
             {
-                // TODO: This doesn't prevent the user from walking yet.
-                // Setting parent ID would fix this, if we knew what value
-                // to use.  Or we could add a m_isSitting variable.
+                m_updateCount = 0;  // Kill animation update burst so that the SIT_G.. will stick.
                 Animator.TrySetMovementAnimation("SIT_GROUND_CONSTRAINED");
             }
 
@@ -1648,9 +1651,9 @@ namespace OpenSim.Region.Framework.Scenes
                 {
                     AddToPhysicalScene(false);
                 }
-
                 m_pos += m_parentPosition + new Vector3(0.0f, 0.0f, 2.0f*m_sitAvatarHeight);
                 m_parentPosition = Vector3.Zero;
+//Console.WriteLine("Stand Pos {0}", m_pos);
 
                 m_parentID = 0;
                 SendFullUpdateToAllClients();
@@ -1744,21 +1747,37 @@ namespace OpenSim.Region.Framework.Scenes
                     
 //Console.WriteLine("SendSitResponse offset=" + offset + "  UnOccup=" + SitTargetUnOccupied +
 //                                      "    TargSet=" + SitTargetisSet);
-                                        
-                if (SitTargetisSet && SitTargetUnOccupied)
-                {
-                    part.SetAvatarOnSitTarget(UUID);
-                    offset = new Vector3(avSitOffSet.X, avSitOffSet.Y, avSitOffSet.Z);
-                    sitOrientation = avSitOrientation;
-                    autopilot = false;                                          // Jump direct to scripted llSitPos()
-                }
+                                // Sit analysis rewritten by KF 091125 
+                if (SitTargetisSet)             // scipted sit
+                {
+                                        if (SitTargetUnOccupied)
+                                        {
+                        part.SetAvatarOnSitTarget(UUID);                // set that Av will be on it
+                        offset = new Vector3(avSitOffSet.X, avSitOffSet.Y, avSitOffSet.Z);      // change ofset to the scripted one
+                        sitOrientation = avSitOrientation;              // Change rotatione to the scripted one
+                        autopilot = false;                                              // Jump direct to scripted llSitPos()
+                    }
+                        else return;
+                }
+                else    // Not Scripted
+                {
+                        if ( (Math.Abs(offset.X) > 0.5f) || (Math.Abs(offset.Y) > 0.5f) ) // large prim
+                        {
+                                Quaternion partIRot = Quaternion.Inverse(part.GetWorldRotation());
+                                m_avUnscriptedSitPos = offset * partIRot;               // sit where clicked
+                                pos = part.AbsolutePosition + (offset  * partIRot);
+                        }
+                        else            // small prim
+                        {
+                                                if (SitTargetUnOccupied)
+                                                {
+                                                        m_avUnscriptedSitPos = Vector3.Zero;    // Sit on unoccupied small prim center
+                                                        pos = part.AbsolutePosition;
+                                }
+                                else return;            // occupied small
+                        }       // end large/small
+                } // end Scripted/not
 
-                pos = part.AbsolutePosition + offset;           // Region position where clicked
-                //if (Math.Abs(part.AbsolutePosition.Z - AbsolutePosition.Z) > 1)
-                //{
-                   // offset = pos;
-                    //autopilot = false;
-                //}
                 if (m_physicsActor != null)
                 {
                     // If we're not using the client autopilot, we're immediately warping the avatar to the location
@@ -1891,8 +1910,9 @@ namespace OpenSim.Region.Framework.Scenes
                     {
                         // Non-scripted sit by Kitto Flora 21Nov09
                         // Calculate angle of line from prim to Av
-                                float y_diff = (m_avInitialPos.Y - part.AbsolutePosition.Y);
-                        float x_diff = ( m_avInitialPos.X - part.AbsolutePosition.X);
+                        Vector3 sitTargetPos= part.AbsolutePosition + m_avUnscriptedSitPos;
+                                float y_diff = (m_avInitialPos.Y - sitTargetPos.Y);
+                        float x_diff = ( m_avInitialPos.X - sitTargetPos.X);
                         if(Math.Abs(x_diff) < 0.001f) x_diff = 0.001f;                  // avoid div by 0
                         if(Math.Abs(y_diff) < 0.001f) y_diff = 0.001f;                  // avoid pol flip at 0
                         float sit_angle = (float)Math.Atan2( (double)y_diff, (double)x_diff);
@@ -1900,23 +1920,30 @@ namespace OpenSim.Region.Framework.Scenes
                                                 // NOTE: when sitting m_ pos and m_bodyRot are *relative* to the prim location/rotation, not 'World'.
                         //  Av sits at world euler <0,0, z>, translated by part rotation 
                         m_bodyRot = partIRot * Quaternion.CreateFromEulers(0f, 0f, sit_angle);          // sit at 0,0,inv-click
-                        m_pos = new Vector3(0f, 0f, 0.05f) + 
-                                        (new Vector3(0.0f, 0f, 0.625f) * partIRot) + 
-                                        (new Vector3(0.25f, 0f, 0.0f) * m_bodyRot);  // sit at center of prim
                         m_parentPosition = part.AbsolutePosition;
-                        //Set up raytrace to find top surface of prim
-                                    Vector3 size = part.Scale;
-                                                float mag = 0.1f + (float)Math.Sqrt((size.X * size.X) + (size.Y * size.Y) + (size.Z * size.Z));
-                                                Vector3 start =  part.AbsolutePosition + new Vector3(0f, 0f, mag);
-                                                Vector3 down = new Vector3(0f, 0f, -1f);    
-                            m_scene.PhysicsScene.RaycastWorld(
-                                start,          // Vector3 position,
-                                down,           // Vector3 direction,
-                                mag,            // float length,
-                                SitAltitudeCallback);           // retMethod
-                    }
-                }
-                else
+                        if(m_avUnscriptedSitPos != Vector3.Zero)
+                        {                               // sit where clicked on big prim
+                                m_pos = m_avUnscriptedSitPos + (new Vector3(0.0f, 0f, 0.625f) * partIRot);
+                            }
+                            else
+                            {             // sit at center of small prim
+                                m_pos = new Vector3(0f, 0f, 0.05f) + 
+                                                (new Vector3(0.0f, 0f, 0.625f) * partIRot) + 
+                                                (new Vector3(0.25f, 0f, 0.0f) * m_bodyRot);
+                                //Set up raytrace to find top surface of prim
+                                            Vector3 size = part.Scale;
+                                                        float mag = 0.1f + (float)Math.Sqrt((size.X * size.X) + (size.Y * size.Y) + (size.Z * size.Z));
+                                                        Vector3 start =  part.AbsolutePosition + new Vector3(0f, 0f, mag);
+                                                        Vector3 down = new Vector3(0f, 0f, -1f);    
+                                    m_scene.PhysicsScene.RaycastWorld(
+                                        start,          // Vector3 position,
+                                        down,           // Vector3 direction,
+                                        mag,            // float length,
+                                        SitAltitudeCallback);           // retMethod
+                            } // end small/big
+                        } // end scripted/not
+                }
+                else  // no Av
                 {
                     return;
                 }
@@ -1932,7 +1959,6 @@ namespace OpenSim.Region.Framework.Scenes
         
         public void SitAltitudeCallback(bool hitYN, Vector3 collisionPoint, uint localid, float distance)
         {
-//                      Console.WriteLine("[RAYCASTRESULT]: Hit={0}, Point={1}, ID={2}, Dist={3}", hitYN, collisionPoint, localid, distance);
                         if(hitYN)
                         {
                                 // m_pos = Av offset from prim center to make look like on center
@@ -2970,6 +2996,7 @@ namespace OpenSim.Region.Framework.Scenes
                     m_updateflag = true;
                     Velocity = force;
                     m_isNudging = false;
+                    m_updateCount = UPDATE_COUNT;                       //KF: Update anims to pickup "STAND"
                 }
             }
         }
@@ -3021,19 +3048,29 @@ namespace OpenSim.Region.Framework.Scenes
         // Event called by the physics plugin to tell the avatar about a collision.
         private void PhysicsCollisionUpdate(EventArgs e)
         {
+                        if (m_updateCount > 0)                  //KF: Update Anims for a short period. Many Anim
+                        {                                                               // changes are very asynchronous.
+                Animator.UpdateMovementAnimations();
+                m_updateCount--;
+                        }
+                        
             if (e == null)
                 return;
 
-            //if ((Math.Abs(Velocity.X) > 0.1e-9f) || (Math.Abs(Velocity.Y) > 0.1e-9f))
             // The Physics Scene will send updates every 500 ms grep: m_physicsActor.SubscribeEvents(
             // as of this comment the interval is set in AddToPhysicalScene
-            Animator.UpdateMovementAnimations();
-
+            
             CollisionEventUpdate collisionData = (CollisionEventUpdate)e;
             Dictionary<uint, ContactPoint> coldata = collisionData.m_objCollisionList;
 
             CollisionPlane = Vector4.UnitW;
 
+                        if (m_lastColCount != coldata.Count)
+                        {       
+                                m_updateCount = 10;
+                                m_lastColCount = coldata.Count;
+                        }
+                        
             if (coldata.Count != 0)
             {
                 switch (Animator.CurrentMovementAnimation)