3 files changed, 31 insertions, 11 deletions

diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index cd28434..3d4490a 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -1142,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;
@@ -1740,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);
@@ -1826,7 +1829,7 @@ namespace OpenSim.Region.Framework.Scenes
                 StandUp();
             }
             m_nextSitAnimation = "SIT";
-
+            
             //SceneObjectPart part = m_scene.GetSceneObjectPart(targetID);
             SceneObjectPart part = FindNextAvailableSitTarget(targetID);
 
@@ -1838,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);
         }
         
diff --git a/OpenSim/Region/Physics/Manager/PhysicsScene.cs b/OpenSim/Region/Physics/Manager/PhysicsScene.cs
index 6d515e9..217d307 100644
--- a/OpenSim/Region/Physics/Manager/PhysicsScene.cs
+++ b/OpenSim/Region/Physics/Manager/PhysicsScene.cs
@@ -36,7 +36,7 @@ namespace OpenSim.Region.Physics.Manager
 {
     public delegate void physicsCrash();
 
-    public delegate void RaycastCallback(bool hitYN, Vector3 collisionPoint, uint localid, float distance);
+    public delegate void RaycastCallback(bool hitYN, Vector3 collisionPoint, uint localid, float distance, Vector3 normal);
 
     public abstract class PhysicsScene
     {
@@ -204,7 +204,7 @@ namespace OpenSim.Region.Physics.Manager
         public virtual void RaycastWorld(Vector3 position, Vector3 direction, float length, RaycastCallback retMethod)
         {
             if (retMethod != null)
-                retMethod(false, Vector3.Zero, 0, 999999999999f);
+                retMethod(false, Vector3.Zero, 0, 999999999999f, Vector3.Zero);
         }
 
         private class NullPhysicsScene : PhysicsScene
diff --git a/OpenSim/Region/Physics/OdePlugin/ODERayCastRequestManager.cs b/OpenSim/Region/Physics/OdePlugin/ODERayCastRequestManager.cs
index c8ae229..732e835 100644
--- a/OpenSim/Region/Physics/OdePlugin/ODERayCastRequestManager.cs
+++ b/OpenSim/Region/Physics/OdePlugin/ODERayCastRequestManager.cs
@@ -145,6 +145,7 @@ namespace OpenSim.Region.Physics.OdePlugin
             uint hitConsumerID = 0;
             float distance = 999999999999f;
             Vector3 closestcontact = new Vector3(99999f, 99999f, 99999f);
+            Vector3 snormal = Vector3.Zero;
 
             // Find closest contact and object.
             lock (m_contactResults)
@@ -157,6 +158,7 @@ namespace OpenSim.Region.Physics.OdePlugin
                         hitConsumerID = cResult.ConsumerID;
                         distance = cResult.Depth;
                         hitYN = true;
+                        snormal = cResult.Normal;
                     }
                 }
 
@@ -165,7 +167,7 @@ namespace OpenSim.Region.Physics.OdePlugin
 
             // Return results
             if (req.callbackMethod != null)
-                req.callbackMethod(hitYN, closestcontact, hitConsumerID, distance);
+                req.callbackMethod(hitYN, closestcontact, hitConsumerID, distance, snormal);
         }
 
         // This is the standard Near.   Uses space AABBs to speed up detection.
@@ -310,7 +312,8 @@ namespace OpenSim.Region.Physics.OdePlugin
                         collisionresult.ConsumerID = ((OdePrim)p1).m_localID;
                         collisionresult.Pos = new Vector3(contacts[i].pos.X, contacts[i].pos.Y, contacts[i].pos.Z);
                         collisionresult.Depth = contacts[i].depth;
-                        
+                        collisionresult.Normal = new Vector3(contacts[i].normal.X, contacts[i].normal.Y,
+                                                             contacts[i].normal.Z);
                         lock (m_contactResults)
                             m_contactResults.Add(collisionresult);
                     }
@@ -325,6 +328,8 @@ namespace OpenSim.Region.Physics.OdePlugin
                         collisionresult.ConsumerID = ((OdePrim)p2).m_localID;
                         collisionresult.Pos = new Vector3(contacts[i].pos.X, contacts[i].pos.Y, contacts[i].pos.Z);
                         collisionresult.Depth = contacts[i].depth;
+                        collisionresult.Normal = new Vector3(contacts[i].normal.X, contacts[i].normal.Y,
+                                      contacts[i].normal.Z);
 
                         lock (m_contactResults)
                             m_contactResults.Add(collisionresult);
@@ -358,5 +363,6 @@ namespace OpenSim.Region.Physics.OdePlugin
         public Vector3 Pos;
         public float Depth;
         public uint ConsumerID;
+        public Vector3 Normal;
     }
 }