OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix a nullref issue in SitAltitudeCallback

avinationmerge
Tom Grimshaw 2010-05-19 13:44:59 -07:00
parent fc76b5f589
commit f77f9ecd8f
1 changed files with 53 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
OpenSim/Region/Framework/Scenes/ScenePresence.cs
View File

@ -2357,11 +2357,14 @@ namespace OpenSim.Region.Framework.Scenes
// { // single or child prim // { // single or child prim
partIRot = Quaternion.Inverse(part.GetWorldRotation()); partIRot = Quaternion.Inverse(part.GetWorldRotation());
// } // }
if (m_initialSitTarget != null)
{
float offZ = collisionPoint.Z - m_initialSitTarget.Z; float offZ = collisionPoint.Z - m_initialSitTarget.Z;
Vector3 offset = new Vector3(0.0f, 0.0f, offZ) * partIRot; // Altitude correction Vector3 offset = new Vector3(0.0f, 0.0f, offZ) * partIRot; // Altitude correction
//Console.WriteLine("sitPoint={0}, offset={1}", sitPoint, offset); //Console.WriteLine("sitPoint={0}, offset={1}", sitPoint, offset);
m_pos += offset; m_pos += offset;
// ControllingClient.SendClearFollowCamProperties(part.UUID); // ControllingClient.SendClearFollowCamProperties(part.UUID);
}
} }
} // End SitAltitudeCallback KF. } // End SitAltitudeCallback KF.