Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[Follow] Try to sit on far away objects by moving closer

Browse Source 
Groundsit if that still fails
This commit is contained in:
Liru Færs
2020-01-17 02:25:45 -05:00
parent 2eff62ad0d
commit 5f0b23edd7
1 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
indra/newview/llagent.cpp
View File

@@ -1785,13 +1785,18 @@ void LLAgent::autoPilot(F32 *delta_yaw)
{
if (auto seat = av->getParent())
{
mAutoPilotNoProgressFrameCount = 0; // Ground Sit may have incremented this, reset it
if (gAgentAvatarp->getParent() != seat)
if (gAgentAvatarp->getParent() == seat)
{
mAutoPilotNoProgressFrameCount = 0; // We may have incremented this before making it here, reset it
return; // We're seated with them, nothing more to do
}
else if (!getAutoPilotNoProgress())
{
void handle_object_sit(LLViewerObject*, const LLVector3&);
handle_object_sit(static_cast<LLViewerObject*>(seat), LLVector3::zero);
follow = 2; // Indicate ground sitting is okay if we can't make it
}
return; // If sitting, we won't be moving, exit here
else return; // If the server just wouldn't let us sit there, we won't be moving, exit here
}
else // Ground sit, but only if near enough
{