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

Don't cancel autopilot when escaping out of customize appearance

Browse Source
This commit is contained in:
Liru Færs
2020-01-13 01:34:06 -05:00
parent 82ee06a6bd
commit 34e0c722e7
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
indra/newview/llagentcamera.cpp
View File

@@ -289,11 +289,6 @@ LLAgentCamera::~LLAgentCamera()
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
void LLAgentCamera::resetView(BOOL reset_camera, BOOL change_camera) void LLAgentCamera::resetView(BOOL reset_camera, BOOL change_camera)
{ {
if (gAgent.getAutoPilot())
{
gAgent.stopAutoPilot(TRUE);
}
LLSelectMgr::getInstance()->unhighlightAll(); LLSelectMgr::getInstance()->unhighlightAll();
// By popular request, keep land selection while walking around. JC // By popular request, keep land selection while walking around. JC

5
indra/newview/llviewermenu.cpp
View File

@@ -4084,6 +4084,11 @@ void handle_reset_view()
} }
else else
{ {
if (gAgent.getAutoPilot())
{
gAgent.stopAutoPilot(true);
}
reset_view_final( true ); reset_view_final( true );
} }
} }