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

Fix the sit code to ensure that we use the root prim of a linkset as a reference in the case of an avatar sitting on a child prim. This fixes various camera issues and fixes mantis #0000059.

avinationmerge
Tom Grimshaw 2010-06-20 15:38:48 -07:00
parent 33d05ef554
commit fc715a092c
1 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1766,7 +1766,7 @@ namespace OpenSim.Region.Framework.Scenes
if (m_parentID != 0) if (m_parentID != 0)
{ {
SceneObjectPart part = m_scene.GetSceneObjectPart(m_parentID); SceneObjectPart part = m_scene.GetSceneObjectPart(m_requestedSitTargetID);
if (part != null) if (part != null)
{ {
part.TaskInventory.LockItemsForRead(true); part.TaskInventory.LockItemsForRead(true);
@ -2028,7 +2028,9 @@ namespace OpenSim.Region.Framework.Scenes
//Console.WriteLine("Camera At ={0}", cameraAtOffset); //Console.WriteLine("Camera At ={0}", cameraAtOffset);
//Console.WriteLine("Camera Eye ={0}", cameraEyeOffset); //Console.WriteLine("Camera Eye ={0}", cameraEyeOffset);
ControllingClient.SendSitResponse(part.UUID, offsetr, sitOrientation, autopilot, cameraAtOffset, cameraEyeOffset, forceMouselook); //NOTE: SendSitResponse should be relative to the GROUP *NOT* THE PRIM if we're sitting on a child
ControllingClient.SendSitResponse(part.ParentGroup.UUID, offsetr + part.OffsetPosition, sitOrientation, autopilot, cameraAtOffset, cameraEyeOffset, forceMouselook);
m_requestedSitTargetUUID = part.UUID; //KF: Correct autopilot target m_requestedSitTargetUUID = part.UUID; //KF: Correct autopilot target
// This calls HandleAgentSit twice, once from here, and the client calls // This calls HandleAgentSit twice, once from here, and the client calls
// HandleAgentSit itself after it gets to the location // HandleAgentSit itself after it gets to the location
@ -2398,7 +2400,17 @@ Console.WriteLine("Scripted Sit ofset {0}", m_pos);
return; return;
} }
} }
m_parentID = m_requestedSitTargetID;
//We want our offsets to reference the root prim, not the child we may have sat on
if (!part.IsRoot)
{
m_parentID = part.ParentGroup.RootPart.LocalId;
m_pos += part.OffsetPosition;
}
else
{
m_parentID = m_requestedSitTargetID;
}
Velocity = Vector3.Zero; Velocity = Vector3.Zero;
RemoveFromPhysicalScene(); RemoveFromPhysicalScene();