livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

SH-915 WIP - removed coupling between autopilot flycam and joystick flycam

meow-7.2.2
Brad Payne (Vir Linden) 2011-02-11 13:19:49 -05:00
parent 29ea62811f
commit d381ec4209
2 changed files with 6 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
indra/newview/llagentpilot.cpp
View File

@ -35,7 +35,6 @@
#include "llappviewer.h"
#include "llviewercontrol.h"
#include "llviewercamera.h"
#include "llviewerjoystick.h"
#include "llsdserialize.h"
#include "llsdutil_math.h"
@ -259,11 +258,6 @@ void LLAgentPilot::startPlayback()
if (mActions.count())
{
llinfos << "Starting playback, moving to waypoint 0" << llendl;
if (getOverrideCamera() &&
!LLViewerJoystick::getInstance()->getOverrideCamera())
{
LLViewerJoystick::getInstance()->toggleFlycam();
}
gAgent.startAutoPilotGlobal(mActions[0].mTarget);
moveCamera();
mStarted = FALSE;

15
indra/newview/llappviewer.cpp
View File

@ -4220,16 +4220,13 @@ void LLAppViewer::idle()
LLWorld::getInstance()->updateParticles();
}
if (LLViewerJoystick::getInstance()->getOverrideCamera())
if (gAgentPilot.isPlaying() && gAgentPilot.getOverrideCamera())
{
gAgentPilot.moveCamera();
}
else if (LLViewerJoystick::getInstance()->getOverrideCamera())
{
if (gAgentPilot.isPlaying() && gAgentPilot.getOverrideCamera())
{
gAgentPilot.moveCamera();
}
else
{
LLViewerJoystick::getInstance()->moveFlycam();
}
LLViewerJoystick::getInstance()->moveFlycam();
}
else
{