2 files changed, 86 insertions, 27 deletions

diff --git a/OpenSim/Data/SQLite/SQLiteRegionData.cs b/OpenSim/Data/SQLite/SQLiteRegionData.cs
index f1c1f78..83fd775 100644
--- a/OpenSim/Data/SQLite/SQLiteRegionData.cs
+++ b/OpenSim/Data/SQLite/SQLiteRegionData.cs
@@ -329,7 +329,7 @@ namespace OpenSim.Data.SQLite
             {
                 foreach (SceneObjectPart prim in obj.Children.Values)
                 {
-                    m_log.Info("[REGION DB]: Adding obj: " + obj.UUID + " to region: " + regionUUID);
+//                    m_log.Info("[REGION DB]: Adding obj: " + obj.UUID + " to region: " + regionUUID);
                     addPrim(prim, obj.UUID, regionUUID);
                 }
             }
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index c553ca0..c67463a 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -670,8 +670,7 @@ namespace OpenSim.Region.Framework.Scenes
 
 
             AdjustKnownSeeds();
-
-           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)
@@ -1660,16 +1659,27 @@ namespace OpenSim.Region.Framework.Scenes
                 }
                                 // part.GetWorldRotation()   is the rotation of the object being sat on
                                 // Rotation  is the sittiing Av's rotation
-                                
-                                Quaternion wr = Quaternion.Inverse(Quaternion.Inverse(Rotation) * Quaternion.Inverse(part.GetWorldRotation())); // world or. of the av
-                                Vector3 so = new Vector3(1.0f, 0f, 0f) * wr;            // 1M infront of av
-                                Vector3 wso = so + part.GetWorldPosition() + ( m_pos * part.GetWorldRotation());                        // + av sit offset!
+
+                        Quaternion partRot;
+                    if (part.LinkNum == 1)
+                    {                           // Root prim of linkset
+                        partRot = part.ParentGroup.RootPart.RotationOffset;
+                    }
+                    else
+                    {                           // single or child prim
+                        partRot = part.GetWorldRotation();
+                    }                       
+                    Quaternion partIRot = Quaternion.Inverse(partRot);
+
+                                Quaternion avatarRot = Quaternion.Inverse(Quaternion.Inverse(Rotation) * partIRot); // world or. of the av
+                                Vector3 avStandUp = new Vector3(1.0f, 0f, 0f) * avatarRot;              // 1M infront of av
+                                Vector3 avWorldStandUp = avStandUp + part.GetWorldPosition() + ( m_pos * partRot);                      // + av sit offset!
 
                 if (m_physicsActor == null)
                 {
                     AddToPhysicalScene(false);
                 }
-                        AbsolutePosition = wso;                  //KF: Fix stand up.
+                        AbsolutePosition = avWorldStandUp;                       //KF: Fix stand up.
                 m_parentPosition = Vector3.Zero;
                                 m_parentID = 0;
                 part.IsOccupied = false;
@@ -1680,7 +1690,6 @@ namespace OpenSim.Region.Framework.Scenes
                     SetHeight(m_avHeight);
                 }
             }
-
             Animator.TrySetMovementAnimation("STAND");
         }
 
@@ -1752,8 +1761,17 @@ namespace OpenSim.Region.Framework.Scenes
             Quaternion avSitOrientation = part.SitTargetOrientation;
 
             bool SitTargetisSet = (Vector3.Zero != avSitOffSet);                //NB Latest SL Spec shows Sit Rotation setting is ignored.
-                Quaternion partIRot = Quaternion.Inverse(part.GetWorldRotation());
-                       
+   //           Quaternion partIRot = Quaternion.Inverse(part.GetWorldRotation());
+                Quaternion partRot;
+            if (part.LinkNum == 1)
+            {                           // Root prim of linkset
+                partRot = part.ParentGroup.RootPart.RotationOffset;
+            }
+            else
+            {                           // single or child prim
+                partRot = part.GetWorldRotation();
+            }                       
+                Quaternion partIRot = Quaternion.Inverse(partRot);
 //Console.WriteLine("SendSitResponse offset=" + offset + "  Occup=" + part.IsOccupied + "    TargSet=" + SitTargetisSet);
                         // Sit analysis rewritten by KF 091125 
             if (SitTargetisSet)                 // scipted sit
@@ -1800,6 +1818,8 @@ namespace OpenSim.Region.Framework.Scenes
             cameraAtOffset = part.GetCameraAtOffset();
             cameraEyeOffset = part.GetCameraEyeOffset();
             forceMouselook = part.GetForceMouselook();
+            if(cameraAtOffset == Vector3.Zero) cameraAtOffset =  new Vector3(0f, 0f, 0.1f); // 
+            if(cameraEyeOffset == Vector3.Zero) cameraEyeOffset =  new Vector3(0f, 0f, 0.1f); // 
 
             if (m_physicsActor != null)
             {
@@ -1823,7 +1843,29 @@ namespace OpenSim.Region.Framework.Scenes
             }
             else return;    // physactor is null! 
 
-                        Vector3 offsetr = offset * partIRot;            
+                        Vector3 offsetr; // = offset * partIRot;        
+                        // KF: In a linkset, offsetr needs to be relative to the group root!  091208    
+        //              offsetr = (part.OffsetPosition * Quaternion.Inverse(part.ParentGroup.RootPart.RotationOffset)) + (offset * partIRot);
+            if (part.LinkNum < 2)
+            {                           // Single, or Root prim of linkset, target is ClickOffset * RootRot
+                offsetr = offset * partIRot;
+            }
+            else
+            {   // Child prim, offset is (ChildOffset * RootRot) + (ClickOffset * ChildRot)
+                offsetr = //(part.OffsetPosition * Quaternion.Inverse(part.ParentGroup.RootPart.RotationOffset)) +      
+                                        (offset * partRot);
+            }
+
+//Console.WriteLine(" ");
+//Console.WriteLine("link number ={0}", part.LinkNum);          
+//Console.WriteLine("Prim offset ={0}", part.OffsetPosition );                  
+//Console.WriteLine("Root Rotate ={0}", part.ParentGroup.RootPart.RotationOffset);
+//Console.WriteLine("Click offst ={0}", offset);
+//Console.WriteLine("Prim Rotate ={0}", part.GetWorldRotation());
+//Console.WriteLine("offsetr     ={0}", offsetr);
+//Console.WriteLine("Camera At   ={0}", cameraAtOffset);
+//Console.WriteLine("Camera Eye  ={0}", cameraEyeOffset);
+
             ControllingClient.SendSitResponse(part.UUID, offsetr, sitOrientation, autopilot, cameraAtOffset, cameraEyeOffset, forceMouselook);
             m_requestedSitTargetUUID = part.UUID;               //KF: Correct autopilot target
             // This calls HandleAgentSit twice, once from here, and the client calls
@@ -2142,13 +2184,20 @@ namespace OpenSim.Region.Framework.Scenes
                     }
                     else
                     {
-//Console.WriteLine("NON Scripted Sit");
                                                 // if m_avUnscriptedSitPos is zero then Av sits above center
                                                 // Else Av sits at m_avUnscriptedSitPos                                         
                                                 
                         // Non-scripted sit by Kitto Flora 21Nov09
                         // Calculate angle of line from prim to Av
-                        Quaternion partIRot = Quaternion.Inverse(part.GetWorldRotation());
+                        Quaternion partIRot;
+                        if (part.LinkNum == 1)
+                        {                               // Root prim of linkset
+                                partIRot = Quaternion.Inverse(part.ParentGroup.RootPart.RotationOffset);
+                        }
+                        else
+                        {                               // single or child prim
+                                partIRot = Quaternion.Inverse(part.GetWorldRotation());
+                        }
                         Vector3 sitTargetPos= part.AbsolutePosition + m_avUnscriptedSitPos;
                                 float y_diff = (m_avInitialPos.Y - sitTargetPos.Y);
                         float x_diff = ( m_avInitialPos.X - sitTargetPos.X);
@@ -2167,7 +2216,7 @@ namespace OpenSim.Region.Framework.Scenes
                                         m_avUnscriptedSitPos;                                                   // adds click offset, if any
                             //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));
+                                                float mag = 2.0f; // 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);    
 //Console.WriteLine("st={0}  do={1}  ma={2}", start, down, mag);                                                
@@ -2203,11 +2252,21 @@ namespace OpenSim.Region.Framework.Scenes
                                 // collisionPoint = spot on prim where we want to sit
                                 // collisionPoint.Z = global sit surface height
                                 SceneObjectPart part = m_scene.GetSceneObjectPart(localid);
-                                Quaternion partIRot = Quaternion.Inverse(part.GetWorldRotation());
+                                Quaternion partIRot;
+                    if (part.LinkNum == 1)
+                {                               // Root prim of linkset
+                    partIRot = Quaternion.Inverse(part.ParentGroup.RootPart.RotationOffset);
+                }
+                else
+                {                               // single or child prim
+                    partIRot = Quaternion.Inverse(part.GetWorldRotation());
+                }                       
                                 float offZ = collisionPoint.Z - m_initialSitTarget.Z;
                                 Vector3 offset = new Vector3(0.0f, 0.0f, offZ) * partIRot; // Altitude correction
 //Console.WriteLine("sitPoint={0},  offset={1}",  sitPoint,  offset);
                                 m_pos += offset;
+//  ControllingClient.SendClearFollowCamProperties(part.UUID);
+                                
                         }
                 } // End SitAltitudeCallback  KF.
 
@@ -3236,7 +3295,7 @@ namespace OpenSim.Region.Framework.Scenes
                     m_updateflag = true;
                     Velocity = force;
                     m_isNudging = false;
-                    m_updateCount = UPDATE_COUNT;                       //KF: Update anims to pickup "STAND"
+                        m_updateCount = UPDATE_COUNT;                   //KF: Update anims to pickup "STAND"
                 }
             }
         }
@@ -3288,19 +3347,19 @@ 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;
-
-            // The Physics Scene will send updates every 500 ms grep: m_physicsActor.SubscribeEvents(
+                
+            // The Physics Scene will send (spam!) updates every 500 ms grep: m_physicsActor.SubscribeEvents(
             // as of this comment the interval is set in AddToPhysicalScene
             if (Animator!=null)
-                Animator.UpdateMovementAnimations();
+            {
+                                if (m_updateCount > 0)                  //KF: DO NOT call UpdateMovementAnimations outside of the m_updateCount wrapper,
+                                {                                                               //  else its will lock out other animation changes, like ground sit.
+                        Animator.UpdateMovementAnimations();
+                        m_updateCount--;
+                                }
+                        }
 
             CollisionEventUpdate collisionData = (CollisionEventUpdate)e;
             Dictionary<uint, ContactPoint> coldata = collisionData.m_objCollisionList;
@@ -3309,7 +3368,7 @@ namespace OpenSim.Region.Framework.Scenes
 
                         if (m_lastColCount != coldata.Count)
                         {       
-                                m_updateCount = 10;
+                                m_updateCount = UPDATE_COUNT;
                                 m_lastColCount = coldata.Count;
                         }