1 files changed, 14 insertions, 14 deletions

diff --git a/indra/newview/lljoystickbutton.cpp b/indra/newview/lljoystickbutton.cpp
index d5110c881a..7aea9c36bc 100644
--- a/indra/newview/lljoystickbutton.cpp
+++ b/indra/newview/lljoystickbutton.cpp
@@ -79,7 +79,7 @@ LLJoystick::LLJoystick(const LLJoystick::Params& p)
 	mVertSlopFar(0),
 	mHorizSlopNear(0),
 	mHorizSlopFar(0),
-	mHeldDown(FALSE),
+	mHeldDown(false),
 	mHeldDownTimer(),
 	mInitialQuadrant(p.quadrant)
 {
@@ -220,7 +220,7 @@ void LLJoystick::onBtnHeldDown(void *userdata)
 	LLJoystick *self = (LLJoystick *)userdata;
 	if (self)
 	{
-		self->mHeldDown = TRUE;
+		self->mHeldDown = true;
 		self->onHeldDown();
 	}
 }
@@ -419,11 +419,11 @@ void LLJoystickAgentSlide::onHeldDown()
 
 LLJoystickCameraRotate::LLJoystickCameraRotate(const LLJoystickCameraRotate::Params& p)
 :	LLJoystick(p), 
-	mInLeft( FALSE ),
-	mInTop( FALSE ),
-	mInRight( FALSE ),
-	mInBottom( FALSE ),
-	mInCenter( FALSE )
+	mInLeft( false ),
+	mInTop( false ),
+	mInRight( false ),
+	mInBottom( false ),
+	mInCenter( false )
 { 
 	mCenterImageName = "Cam_Rotate_Center";
 }
@@ -446,7 +446,7 @@ void LLJoystickCameraRotate::updateSlop()
 
 bool LLJoystickCameraRotate::handleMouseDown(S32 x, S32 y, MASK mask)
 {
-	gAgent.setMovementLocked(TRUE);
+	gAgent.setMovementLocked(true);
 	updateSlop();
 
 	// Set initial offset based on initial click location
@@ -461,7 +461,7 @@ bool LLJoystickCameraRotate::handleMouseDown(S32 x, S32 y, MASK mask)
 		mInitialOffset.mX = 0;
 		mInitialOffset.mY = 0;
 		mInitialQuadrant = JQ_ORIGIN;
-		mInCenter = TRUE;
+		mInCenter = true;
 
 		resetJoystickCamera();
 	}
@@ -499,8 +499,8 @@ bool LLJoystickCameraRotate::handleMouseDown(S32 x, S32 y, MASK mask)
 
 bool LLJoystickCameraRotate::handleMouseUp(S32 x, S32 y, MASK mask)
 {
-	gAgent.setMovementLocked(FALSE);
-	mInCenter = FALSE;
+	gAgent.setMovementLocked(false);
+	mInCenter = false;
 	return LLJoystick::handleMouseUp(x, y, mask);
 }
 
@@ -508,7 +508,7 @@ bool LLJoystickCameraRotate::handleHover(S32 x, S32 y, MASK mask)
 {
 	if (!pointInCenterDot(x, y, CENTER_DOT_RADIUS))
 	{
-		mInCenter = FALSE;
+		mInCenter = false;
 	}
 
 	return LLJoystick::handleHover(x, y, mask);
@@ -568,7 +568,7 @@ F32 LLJoystickCameraRotate::getOrbitRate()
 
 
 // Only used for drawing
-void LLJoystickCameraRotate::setToggleState( BOOL left, BOOL top, BOOL right, BOOL bottom )
+void LLJoystickCameraRotate::setToggleState( bool left, bool top, bool right, bool bottom )
 {
 	mInLeft = left;
 	mInTop = top;
@@ -737,7 +737,7 @@ LLJoystickQuaternion::LLJoystickQuaternion(const LLJoystickQuaternion::Params &p
     }
 }
 
-void LLJoystickQuaternion::setToggleState(BOOL left, BOOL top, BOOL right, BOOL bottom)
+void LLJoystickQuaternion::setToggleState(bool left, bool top, bool right, bool bottom)
 {
     mInLeft = left;
     mInTop = top;