1 files changed, 9 insertions, 6 deletions

diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index 0b644b9..b6081de 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -2368,12 +2368,15 @@ Console.WriteLine("Scripted Sit ofset {0}", m_pos);
 //              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);
+//              }          
+                if (m_initialSitTarget != null)
+                {
+                    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.