Merge branch 'ubitwork' into avination

1 files changed, 2 insertions, 3 deletions

diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index 5087882..4504e18 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -1415,8 +1415,9 @@ namespace OpenSim.Region.Framework.Scenes
 
             if (m_followCamAuto)
             {
-                if (hitYN)
+                if (hitYN && localid != LocalId)
                 {
+
                     CameraConstraintActive = true;
                     //m_log.DebugFormat("[RAYCASTRESULT]: {0}, {1}, {2}, {3}", hitYN, collisionPoint, localid, distance);
                     
@@ -2282,7 +2283,6 @@ namespace OpenSim.Region.Framework.Scenes
                 ControllingClient.SendAlertMessage(" Sit position on restricted land, try another spot");
                 return;
             }
-//            m_log.InfoFormat("physsit {0} {1}", offset.ToString(),Orientation.ToString());
 
             RemoveFromPhysicalScene();
 
@@ -2293,7 +2293,6 @@ namespace OpenSim.Region.Framework.Scenes
 
             part.AddSittingAvatar(UUID);
 
-
             Vector3 cameraAtOffset = part.GetCameraAtOffset();
             Vector3 cameraEyeOffset = part.GetCameraEyeOffset();
             bool forceMouselook = part.GetForceMouselook();