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

[Follow] Do not fly unless flying avatar target or already flying

Browse Source
This commit is contained in:
Liru Færs
2020-01-08 16:54:30 -05:00
parent d06448cdfd
commit c1ffb1b332
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
indra/newview/llagent.cpp
View File

@@ -1613,12 +1613,14 @@ void LLAgent::startAutoPilotGlobal(
mAutoPilotFlyOnStop = FALSE; mAutoPilotFlyOnStop = FALSE;
} }
if (distance > 30.0 && mAutoPilotAllowFlying) bool follow = mAutoPilotBehaviorName == "Follow";
if (!follow && distance > 30.0 && mAutoPilotAllowFlying)
{ {
setFlying(TRUE); setFlying(TRUE);
} }
if ( distance > 1.f && if (!follow && distance > 1.f &&
mAutoPilotAllowFlying && mAutoPilotAllowFlying &&
heightDelta > (sqrtf(mAutoPilotStopDistance) + 1.f)) heightDelta > (sqrtf(mAutoPilotStopDistance) + 1.f))
{ {