1 files changed, 48 insertions, 54 deletions

diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index 6812914..f6bcb59 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -790,37 +790,13 @@ namespace OpenSim.Region.Framework.Scenes
         /// </summary>
         public void SendPrimUpdates()
         {
-            m_perfMonMS = EnvironmentTickCount();
+            m_perfMonMS = Util.EnvironmentTickCount();
 
             m_sceneViewer.SendPrimUpdates();
 
-            m_scene.StatsReporter.AddAgentTime(EnvironmentTickCountSubtract(m_perfMonMS));
+            m_scene.StatsReporter.AddAgentTime(Util.EnvironmentTickCountSubtract(m_perfMonMS));
         }
 
-        /// <summary>
-        /// Environment.TickCount is an int but it counts all 32 bits so it goes positive
-        /// and negative every 24.9 days. This trims down TickCount so it doesn't wrap
-        /// for the callers. 
-        /// This trims it to a 12 day interval so don't let your frame time get too long.
-        /// </summary>
-        /// <returns></returns>
-        const Int32 EnvironmentTickCountMask = 0x3fffffff;
-        private static Int32 EnvironmentTickCount() {
-            return Environment.TickCount & EnvironmentTickCountMask;
-        }
-
-        /// <summary>
-        /// Environment.TickCount is an int but it counts all 32 bits so it goes positive
-        /// and negative every 24.9 days. Subtracts the passed value (previously fetched by
-        /// 'EnvironmentTickCount()') and accounts for any wrapping.
-        /// </summary>
-        /// <returns>subtraction of passed prevValue from current Environment.TickCount</returns>
-        private static Int32 EnvironmentTickCountSubtract(Int32 prevValue) {
-            Int32 diff = EnvironmentTickCount() - prevValue;
-            return (diff >= 0) ? diff : (diff + EnvironmentTickCountMask + 1);
-        }
-
-
         #region Status Methods
 
         /// <summary>
@@ -1166,7 +1142,7 @@ namespace OpenSim.Region.Framework.Scenes
         /// <param name="collisionPoint"></param>
         /// <param name="localid"></param>
         /// <param name="distance"></param>
-        public void RayCastCameraCallback(bool hitYN, Vector3 collisionPoint, uint localid, float distance)
+        public void RayCastCameraCallback(bool hitYN, Vector3 collisionPoint, uint localid, float distance, Vector3 pNormal)
         {
             const float POSITION_TOLERANCE = 0.02f;
             const float VELOCITY_TOLERANCE = 0.02f;
@@ -1209,7 +1185,7 @@ namespace OpenSim.Region.Framework.Scenes
             //    return;
             //}
 
-            m_perfMonMS = EnvironmentTickCount();
+            m_perfMonMS = Util.EnvironmentTickCount();
 
             ++m_movementUpdateCount;
             if (m_movementUpdateCount < 1)
@@ -1539,7 +1515,7 @@ namespace OpenSim.Region.Framework.Scenes
 
             m_scene.EventManager.TriggerOnClientMovement(this);
 
-            m_scene.StatsReporter.AddAgentTime(EnvironmentTickCountSubtract(m_perfMonMS));
+            m_scene.StatsReporter.AddAgentTime(Util.EnvironmentTickCountSubtract(m_perfMonMS));
         }
 
         public void DoAutoPilot(uint not_used, Vector3 Pos, IClientAPI remote_client)
@@ -1764,11 +1740,14 @@ namespace OpenSim.Region.Framework.Scenes
                 UUID avOnTargetAlready = part.GetAvatarOnSitTarget();
 
                 bool SitTargetUnOccupied = (!(avOnTargetAlready != UUID.Zero));
-//                bool SitTargetisSet =
-//                  (!(avSitOffSet.X == 0f && avSitOffSet.Y == 0f && avSitOffSet.Z == 0f && avSitOrientation.W == 0f &&
-//                   avSitOrientation.X == 0f && avSitOrientation.Y == 0f && avSitOrientation.Z == 1f));
-
-                bool SitTargetisSet = ((Vector3.Zero != avSitOffSet)  || (Quaternion.Identity != avSitOrientation));
+                bool SitTargetisSet =
+                    (!(avSitOffSet.X == 0f && avSitOffSet.Y == 0f && avSitOffSet.Z == 0f &&
+                       (
+                           avSitOrientation.X == 0f && avSitOrientation.Y == 0f && avSitOrientation.Z == 0f && avSitOrientation.W == 1f // Valid Zero Rotation quaternion
+                           || avSitOrientation.X == 0f && avSitOrientation.Y == 0f && avSitOrientation.Z == 1f && avSitOrientation.W == 0f // W-Z Mapping was invalid at one point
+                           || avSitOrientation.X == 0f && avSitOrientation.Y == 0f && avSitOrientation.Z == 0f && avSitOrientation.W == 0f // Invalid Quaternion
+                       )
+                       ));
                     
 //Console.WriteLine("SendSitResponse offset=" + offset + "  UnOccup=" + SitTargetUnOccupied +
 //                                      "    TargSet=" + SitTargetisSet);
@@ -1850,7 +1829,7 @@ namespace OpenSim.Region.Framework.Scenes
                 StandUp();
             }
             m_nextSitAnimation = "SIT";
-
+            
             //SceneObjectPart part = m_scene.GetSceneObjectPart(targetID);
             SceneObjectPart part = FindNextAvailableSitTarget(targetID);
 
@@ -1862,12 +1841,23 @@ namespace OpenSim.Region.Framework.Scenes
                 }
                 m_requestedSitTargetID = part.LocalId;
                 //m_requestedSitOffset = offset;
+                //offset.X += part.Scale.X;// *offset.X;
+                //offset.Y += part.Scale.Y;// * offset.Y;
+                //offset.Z += part.Scale.Z;// * offset.Z;
+                //m_requestedSitOffset = offset;
+                m_log.DebugFormat("[SIT]: Client requested Sit Position: {0}", offset);
             }
             else
             {
                 
                 m_log.Warn("Sit requested on unknown object: " + targetID.ToString());
             }
+
+            if (m_scene.PhysicsScene.SupportsRayCast())
+            {
+                //m_scene.PhysicsScene.RaycastWorld(Vector3.Zero,Vector3.Zero, 0.01f,new RaycastCallback());
+            }
+
             SendSitResponse(remoteClient, targetID, offset);
         }
         
@@ -1982,7 +1972,7 @@ namespace OpenSim.Region.Framework.Scenes
             SendFullUpdateToAllClients();
         }
         
-        public void SitAltitudeCallback(bool hitYN, Vector3 collisionPoint, uint localid, float distance)
+        public void SitAltitudeCallback(bool hitYN, Vector3 collisionPoint, uint localid, float distance, Vector3 normal)
         {
                         if(hitYN)
                         {
@@ -2057,7 +2047,7 @@ namespace OpenSim.Region.Framework.Scenes
                 return;
             }
 
-            m_perfMonMS = EnvironmentTickCount();
+            m_perfMonMS = Util.EnvironmentTickCount();
 
             Rotation = rotation;
             Vector3 direc = vec * rotation;
@@ -2099,7 +2089,7 @@ namespace OpenSim.Region.Framework.Scenes
             // TODO: Add the force instead of only setting it to support multiple forces per frame?
             m_forceToApply = direc;
             m_isNudging = Nudging;
-            m_scene.StatsReporter.AddAgentTime(EnvironmentTickCount() - m_perfMonMS);
+            m_scene.StatsReporter.AddAgentTime(Util.EnvironmentTickCountSubtract(m_perfMonMS));
         }
 
         #endregion
@@ -2168,7 +2158,7 @@ namespace OpenSim.Region.Framework.Scenes
             // server.
             if (remoteClient.IsActive)
             {
-                m_perfMonMS = EnvironmentTickCount();
+                m_perfMonMS = Util.EnvironmentTickCount();
 
                 PhysicsActor actor = m_physicsActor;
                 Vector3 velocity = (actor != null) ? actor.Velocity : Vector3.Zero;
@@ -2181,7 +2171,7 @@ namespace OpenSim.Region.Framework.Scenes
                 remoteClient.SendAvatarTerseUpdate(new SendAvatarTerseData(m_rootRegionHandle, (ushort)(m_scene.TimeDilation * ushort.MaxValue), LocalId,
                     pos, velocity, Vector3.Zero, m_bodyRot, CollisionPlane, m_uuid, null, GetUpdatePriority(remoteClient)));
 
-                m_scene.StatsReporter.AddAgentTime(EnvironmentTickCountSubtract(m_perfMonMS));
+                m_scene.StatsReporter.AddAgentTime(Util.EnvironmentTickCountSubtract(m_perfMonMS));
                 m_scene.StatsReporter.AddAgentUpdates(1);
             }
         }
@@ -2191,11 +2181,11 @@ namespace OpenSim.Region.Framework.Scenes
         /// </summary>
         public void SendTerseUpdateToAllClients()
         {
-            m_perfMonMS = EnvironmentTickCount();
+            m_perfMonMS = Util.EnvironmentTickCount();
             
             m_scene.ForEachClient(SendTerseUpdateToClient);
 
-            m_scene.StatsReporter.AddAgentTime(EnvironmentTickCountSubtract(m_perfMonMS));
+            m_scene.StatsReporter.AddAgentTime(Util.EnvironmentTickCountSubtract(m_perfMonMS));
         }
 
         public void SendCoarseLocations()
@@ -2215,7 +2205,7 @@ namespace OpenSim.Region.Framework.Scenes
 
         public void SendCoarseLocationsDefault(UUID sceneId, ScenePresence p)
         {
-            m_perfMonMS = EnvironmentTickCount();
+            m_perfMonMS = Util.EnvironmentTickCount();
 
             List<Vector3> CoarseLocations = new List<Vector3>();
             List<UUID> AvatarUUIDs = new List<UUID>();
@@ -2251,7 +2241,7 @@ namespace OpenSim.Region.Framework.Scenes
 
             m_controllingClient.SendCoarseLocationUpdate(AvatarUUIDs, CoarseLocations);
 
-            m_scene.StatsReporter.AddAgentTime(EnvironmentTickCountSubtract(m_perfMonMS));
+            m_scene.StatsReporter.AddAgentTime(Util.EnvironmentTickCountSubtract(m_perfMonMS));
         }
 
         public void CoarseLocationChange()
@@ -2288,7 +2278,7 @@ namespace OpenSim.Region.Framework.Scenes
         /// </summary>
         public void SendInitialFullUpdateToAllClients()
         {
-            m_perfMonMS = EnvironmentTickCount();
+            m_perfMonMS = Util.EnvironmentTickCount();
 
             ScenePresence[] avatars = m_scene.GetScenePresences();
 
@@ -2314,14 +2304,14 @@ namespace OpenSim.Region.Framework.Scenes
             }
 
             m_scene.StatsReporter.AddAgentUpdates(avatars.Length);
-            m_scene.StatsReporter.AddAgentTime(EnvironmentTickCountSubtract(m_perfMonMS));
+            m_scene.StatsReporter.AddAgentTime(Util.EnvironmentTickCountSubtract(m_perfMonMS));
 
             //Animator.SendAnimPack();
         }
 
         public void SendFullUpdateToAllClients()
         {
-            m_perfMonMS = EnvironmentTickCount();
+            m_perfMonMS = Util.EnvironmentTickCount();
 
             // only send update from root agents to other clients; children are only "listening posts"
             List<ScenePresence> avatars = m_scene.GetAvatars();
@@ -2331,7 +2321,7 @@ namespace OpenSim.Region.Framework.Scenes
 
             }
             m_scene.StatsReporter.AddAgentUpdates(avatars.Count);
-            m_scene.StatsReporter.AddAgentTime(EnvironmentTickCountSubtract(m_perfMonMS));
+            m_scene.StatsReporter.AddAgentTime(Util.EnvironmentTickCountSubtract(m_perfMonMS));
 
             Animator.SendAnimPack();
         }
@@ -2373,7 +2363,7 @@ namespace OpenSim.Region.Framework.Scenes
         /// </summary>
         public void SendAppearanceToAllOtherAgents()
         {
-            m_perfMonMS = EnvironmentTickCount();
+            m_perfMonMS = Util.EnvironmentTickCount();
 
             m_scene.ForEachScenePresence(delegate(ScenePresence scenePresence)
                                          {
@@ -2382,8 +2372,8 @@ namespace OpenSim.Region.Framework.Scenes
                                                  SendAppearanceToOtherAgent(scenePresence);
                                              }
                                          });
-            
-            m_scene.StatsReporter.AddAgentTime(EnvironmentTickCountSubtract(m_perfMonMS));
+
+            m_scene.StatsReporter.AddAgentTime(Util.EnvironmentTickCountSubtract(m_perfMonMS));
         }
 
         /// <summary>
@@ -3084,7 +3074,9 @@ namespace OpenSim.Region.Framework.Scenes
 
             // The Physics Scene will send updates every 500 ms grep: m_physicsActor.SubscribeEvents(
             // as of this comment the interval is set in AddToPhysicalScene
-            
+            if (Animator!=null)
+                Animator.UpdateMovementAnimations();
+
             CollisionEventUpdate collisionData = (CollisionEventUpdate)e;
             Dictionary<uint, ContactPoint> coldata = collisionData.m_objCollisionList;
 
@@ -3096,7 +3088,7 @@ namespace OpenSim.Region.Framework.Scenes
                                 m_lastColCount = coldata.Count;
                         }
                         
-            if (coldata.Count != 0)
+            if (coldata.Count != 0 && Animator != null)
             {
                 switch (Animator.CurrentMovementAnimation)
                 {
@@ -3200,11 +3192,13 @@ namespace OpenSim.Region.Framework.Scenes
             
             // I don't get it but mono crashes when you try to dispose of this timer,
             // unsetting the elapsed callback should be enough to allow for cleanup however.
-            //m_reprioritizationTimer.Dispose();
+            // m_reprioritizationTimer.Dispose(); 
 
             m_sceneViewer.Close();
 
             RemoveFromPhysicalScene();
+            m_animator.Close();
+            m_animator = null;
         }
 
         public ScenePresence()