Merge pull request #1413 from secondlife/gltf-dev-maint-a-merge

Merge Maint A to development

1 files changed, 14 insertions, 14 deletions

diff --git a/indra/newview/llagentpilot.cpp b/indra/newview/llagentpilot.cpp
index cfc445f998..c62431db91 100644
--- a/indra/newview/llagentpilot.cpp
+++ b/indra/newview/llagentpilot.cpp
@@ -42,15 +42,15 @@ LLAgentPilot gAgentPilot;
 
 LLAgentPilot::LLAgentPilot() :
 	mNumRuns(-1),
-	mQuitAfterRuns(FALSE),
-	mRecording(FALSE),
+	mQuitAfterRuns(false),
+	mRecording(false),
 	mLastRecordTime(0.f),
-	mStarted(FALSE),
-	mPlaying(FALSE),
+	mStarted(false),
+	mPlaying(false),
 	mCurrentAction(0),
-	mOverrideCamera(FALSE),
-	mLoop(TRUE),
-	mReplaySession(FALSE)
+	mOverrideCamera(false),
+	mLoop(true),
+	mReplaySession(false)
 {
 }
 
@@ -221,14 +221,14 @@ void LLAgentPilot::startRecord()
 	mActions.clear();
 	mTimer.reset();
 	addAction(STRAIGHT);
-	mRecording = TRUE;
+	mRecording = true;
 }
 
 void LLAgentPilot::stopRecord()
 {
 	gAgentPilot.addAction(STRAIGHT);
 	gAgentPilot.save();
-	mRecording = FALSE;
+	mRecording = false;
 }
 
 void LLAgentPilot::addAction(enum EActionType action_type)
@@ -252,7 +252,7 @@ void LLAgentPilot::startPlayback()
 {
 	if (!mPlaying)
 	{
-		mPlaying = TRUE;
+		mPlaying = true;
 		mCurrentAction = 0;
 		mTimer.reset();
 
@@ -261,12 +261,12 @@ void LLAgentPilot::startPlayback()
 			LL_INFOS() << "Starting playback, moving to waypoint 0" << LL_ENDL;
 			gAgent.startAutoPilotGlobal(mActions[0].mTarget);
 			moveCamera();
-			mStarted = FALSE;
+			mStarted = false;
 		}
 		else
 		{
 			LL_INFOS() << "No autopilot data, cancelling!" << LL_ENDL;
-			mPlaying = FALSE;
+			mPlaying = false;
 		}
 	}
 }
@@ -275,7 +275,7 @@ void LLAgentPilot::stopPlayback()
 {
 	if (mPlaying)
 	{
-		mPlaying = FALSE;
+		mPlaying = false;
 		mCurrentAction = 0;
 		mTimer.reset();
 		gAgent.stopAutoPilot();
@@ -347,7 +347,7 @@ void LLAgentPilot::updateTarget()
 					{
 						LL_INFOS() << "At start, beginning playback" << LL_ENDL;
 						mTimer.reset();
-						mStarted = TRUE;
+						mStarted = true;
 					}
 				}
 			}