miscellaneous: BOOL (int) to real bool

25 files changed, 109 insertions, 109 deletions

diff --git a/indra/llcharacter/llbvhloader.cpp b/indra/llcharacter/llbvhloader.cpp
index 5b1b28bf4f..567bdb8c95 100644
--- a/indra/llcharacter/llbvhloader.cpp
+++ b/indra/llcharacter/llbvhloader.cpp
@@ -1266,15 +1266,15 @@ BOOL LLBVHLoader::getLine(apr_file_t* fp)
 {
 	if (apr_file_eof(fp) == APR_EOF)
 	{
-		return FALSE;
+		return false;
 	}
 	if ( apr_file_gets(mLine, BVH_PARSER_LINE_SIZE, fp) == APR_SUCCESS)
 	{
 		mLineNumber++;
-		return TRUE;
+		return true;
 	}
 
-	return FALSE;
+	return false;
 }
 
 // returns required size of output buffer
@@ -1496,5 +1496,5 @@ BOOL LLBVHLoader::serialize(LLDataPacker& dp)
 		}
 
 	
-	return TRUE;
+	return true;
 }
diff --git a/indra/llcharacter/llcharacter.cpp b/indra/llcharacter/llcharacter.cpp
index cf6be8daf0..b373bd75a3 100644
--- a/indra/llcharacter/llcharacter.cpp
+++ b/indra/llcharacter/llcharacter.cpp
@@ -172,7 +172,7 @@ BOOL LLCharacter::isMotionActive(const LLUUID& id)
 		return mMotionController.isMotionActive(motionp);
 	}
 
-	return FALSE;
+	return false;
 }
 
 
@@ -286,9 +286,9 @@ BOOL LLCharacter::setVisualParamWeight(const LLVisualParam* which_param, F32 wei
 	if (index_iter != mVisualParamIndexMap.end())
 	{
 		index_iter->second->setWeight(weight);
-		return TRUE;
+		return true;
 	}
-	return FALSE;
+	return false;
 }
 
 //-----------------------------------------------------------------------------
@@ -303,10 +303,10 @@ BOOL LLCharacter::setVisualParamWeight(const char* param_name, F32 weight)
 	if (name_iter != mVisualParamNameMap.end())
 	{
 		name_iter->second->setWeight(weight);
-		return TRUE;
+		return true;
 	}
 	LL_WARNS() << "LLCharacter::setVisualParamWeight() Invalid visual parameter: " << param_name << LL_ENDL;
-	return FALSE;
+	return false;
 }
 
 //-----------------------------------------------------------------------------
@@ -318,10 +318,10 @@ BOOL LLCharacter::setVisualParamWeight(S32 index, F32 weight)
 	if (index_iter != mVisualParamIndexMap.end())
 	{
 		index_iter->second->setWeight(weight);
-		return TRUE;
+		return true;
 	}
 	LL_WARNS() << "LLCharacter::setVisualParamWeight() Invalid visual parameter index: " << index << LL_ENDL;
-	return FALSE;
+	return false;
 }
 
 //-----------------------------------------------------------------------------
diff --git a/indra/llcharacter/lleditingmotion.cpp b/indra/llcharacter/lleditingmotion.cpp
index c5757163d9..cf6438aad9 100644
--- a/indra/llcharacter/lleditingmotion.cpp
+++ b/indra/llcharacter/lleditingmotion.cpp
@@ -155,7 +155,7 @@ BOOL LLEditingMotion::onActivate()
 	mShoulderJoint.setRotation(	mShoulderState->getJoint()->getRotation() );
 	mElbowJoint.setRotation(	mElbowState->getJoint()->getRotation() );
 
-	return TRUE;
+	return true;
 }
 
 //-----------------------------------------------------------------------------
@@ -168,12 +168,12 @@ BOOL LLEditingMotion::onUpdate(F32 time, U8* joint_mask)
 	LLVector3* pointAtPt = (LLVector3*)mCharacter->getAnimationData("PointAtPoint");
 
 
-	BOOL result = TRUE;
+	BOOL result = true;
 
 	if (!pointAtPt)
 	{
 		focus_pt = mLastSelectPt;
-		result = FALSE;
+		result = false;
 	}
 	else
 	{
diff --git a/indra/llcharacter/lleditingmotion.h b/indra/llcharacter/lleditingmotion.h
index 80c1717a70..35d44c8761 100644
--- a/indra/llcharacter/lleditingmotion.h
+++ b/indra/llcharacter/lleditingmotion.h
@@ -69,7 +69,7 @@ public:
 	//-------------------------------------------------------------------------
 
 	// motions must specify whether or not they loop
-	virtual BOOL getLoop() { return TRUE; }
+	virtual BOOL getLoop() { return true; }
 
 	// motions must report their total duration
 	virtual F32 getDuration() { return 0.0; }
diff --git a/indra/llcharacter/llgesture.cpp b/indra/llcharacter/llgesture.cpp
index 80717d8d26..d0c4139da7 100644
--- a/indra/llcharacter/llgesture.cpp
+++ b/indra/llcharacter/llgesture.cpp
@@ -94,14 +94,14 @@ const LLGesture &LLGesture::operator =(const LLGesture &rhs)
 BOOL LLGesture::trigger(KEY key, MASK mask)
 {
 	LL_WARNS() << "Parent class trigger called: you probably didn't mean this." << LL_ENDL;
-	return FALSE;
+	return false;
 }
 
 
 BOOL LLGesture::trigger(const std::string& trigger_string)
 {
 	LL_WARNS() << "Parent class trigger called: you probably didn't mean this." << LL_ENDL;
-	return FALSE;
+	return false;
 }
 
 // NOT endian-neutral
@@ -267,7 +267,7 @@ BOOL LLGestureList::trigger(KEY key, MASK mask)
 		{
 			if (gesture->trigger(key, mask))
 			{
-				return TRUE;
+				return true;
 			}
 		}
 		else
@@ -275,7 +275,7 @@ BOOL LLGestureList::trigger(KEY key, MASK mask)
 			LL_WARNS() << "NULL gesture in gesture list (" << i << ")" << LL_ENDL;
 		}
 	}
-	return FALSE;
+	return false;
 }
 
 // NOT endian-neutral
diff --git a/indra/llcharacter/llhandmotion.cpp b/indra/llcharacter/llhandmotion.cpp
index ceba956214..1aad9565fc 100644
--- a/indra/llcharacter/llhandmotion.cpp
+++ b/indra/llcharacter/llhandmotion.cpp
@@ -112,7 +112,7 @@ BOOL LLHandMotion::onActivate()
 		mCharacter->setVisualParamWeight(gHandPoseNames[mCurrentPose], 1.f);
 		mCharacter->updateVisualParams();
 	}
-	return TRUE;
+	return true;
 }
 
 
@@ -233,7 +233,7 @@ BOOL LLHandMotion::onUpdate(F32 time, U8* joint_mask)
 		}
 	}
 
-	return TRUE;
+	return true;
 }
 
 
diff --git a/indra/llcharacter/llhandmotion.h b/indra/llcharacter/llhandmotion.h
index 08de7056c8..074ee29de9 100644
--- a/indra/llcharacter/llhandmotion.h
+++ b/indra/llcharacter/llhandmotion.h
@@ -82,7 +82,7 @@ public:
 	//-------------------------------------------------------------------------
 
 	// motions must specify whether or not they loop
-	virtual BOOL getLoop() { return TRUE; }
+	virtual BOOL getLoop() { return true; }
 
 	// motions must report their total duration
 	virtual F32 getDuration() { return 0.0; }
diff --git a/indra/llcharacter/llheadrotmotion.cpp b/indra/llcharacter/llheadrotmotion.cpp
index 07a3aaebb6..85d7611b2c 100644
--- a/indra/llcharacter/llheadrotmotion.cpp
+++ b/indra/llcharacter/llheadrotmotion.cpp
@@ -166,7 +166,7 @@ LLMotion::LLMotionInitStatus LLHeadRotMotion::onInitialize(LLCharacter *characte
 //-----------------------------------------------------------------------------
 BOOL LLHeadRotMotion::onActivate()
 {
-	return TRUE;
+	return true;
 }
 
 
@@ -251,7 +251,7 @@ BOOL LLHeadRotMotion::onUpdate(F32 time, U8* joint_mask)
 		mHeadState->setRotation( nlerp(1.f - NECK_LAG, LLQuaternion::DEFAULT, head_rot_local));
 	}
 
-	return TRUE;
+	return true;
 }
 
 
@@ -364,7 +364,7 @@ LLMotion::LLMotionInitStatus LLEyeMotion::onInitialize(LLCharacter *character)
 //-----------------------------------------------------------------------------
 BOOL LLEyeMotion::onActivate()
 {
-	return TRUE;
+	return true;
 }
 
 //-----------------------------------------------------------------------------
@@ -537,7 +537,7 @@ BOOL LLEyeMotion::onUpdate(F32 time, U8* joint_mask)
     adjustEyeTarget(targetPos, *mLeftEyeState, *mRightEyeState); 
     adjustEyeTarget(targetPos, *mAltLeftEyeState, *mAltRightEyeState); 
 
-	return TRUE;
+	return true;
 }
 
 
diff --git a/indra/llcharacter/llheadrotmotion.h b/indra/llcharacter/llheadrotmotion.h
index 53ae1813bc..6b460fc22e 100644
--- a/indra/llcharacter/llheadrotmotion.h
+++ b/indra/llcharacter/llheadrotmotion.h
@@ -64,7 +64,7 @@ public:
 	//-------------------------------------------------------------------------
 
 	// motions must specify whether or not they loop
-	virtual BOOL getLoop() { return TRUE; }
+	virtual BOOL getLoop() { return true; }
 
 	// motions must report their total duration
 	virtual F32 getDuration() { return 0.0; }
@@ -147,7 +147,7 @@ public:
 	//-------------------------------------------------------------------------
 
 	// motions must specify whether or not they loop
-	virtual BOOL getLoop() { return TRUE; }
+	virtual BOOL getLoop() { return true; }
 
 	// motions must report their total duration
 	virtual F32 getDuration() { return 0.0; }
diff --git a/indra/llcharacter/lljoint.h b/indra/llcharacter/lljoint.h
index 63d99b9209..61ac6b4432 100644
--- a/indra/llcharacter/lljoint.h
+++ b/indra/llcharacter/lljoint.h
@@ -280,7 +280,7 @@ public:
 
 	void clampRotation(LLQuaternion old_rot, LLQuaternion new_rot);
 
-	virtual BOOL isAnimatable() const { return TRUE; }
+	virtual BOOL isAnimatable() const { return true; }
 
 	void addAttachmentPosOverride( const LLVector3& pos, const LLUUID& mesh_id, const std::string& av_info, bool& active_override_changed );
 	void removeAttachmentPosOverride( const LLUUID& mesh_id, const std::string& av_info, bool& active_override_changed );
diff --git a/indra/llcharacter/llkeyframemotion.cpp b/indra/llcharacter/llkeyframemotion.cpp
index d95ec159f2..0345212695 100644
--- a/indra/llcharacter/llkeyframemotion.cpp
+++ b/indra/llcharacter/llkeyframemotion.cpp
@@ -653,7 +653,7 @@ BOOL LLKeyframeMotion::setupPose()
 	setLoopIn(mJointMotionList->mLoopInPoint);
 	setLoopOut(mJointMotionList->mLoopOutPoint);
 
-	return TRUE;
+	return true;
 }
 
 //-----------------------------------------------------------------------------
@@ -674,7 +674,7 @@ BOOL LLKeyframeMotion::onActivate()
 
 	mLastLoopedTime = 0.f;
 
-	return TRUE;
+	return true;
 }
 
 //-----------------------------------------------------------------------------
@@ -1992,7 +1992,7 @@ BOOL LLKeyframeMotion::deserialize(LLDataPacker& dp, const LLUUID& asset_id, boo
 
 	setupPose();
 
-	return TRUE;
+	return true;
 }
 
 //-----------------------------------------------------------------------------
@@ -2000,7 +2000,7 @@ BOOL LLKeyframeMotion::deserialize(LLDataPacker& dp, const LLUUID& asset_id, boo
 //-----------------------------------------------------------------------------
 BOOL LLKeyframeMotion::serialize(LLDataPacker& dp) const
 {
-	BOOL success = TRUE;
+	BOOL success = true;
 
 	LL_DEBUGS("BVH") << "serializing" << LL_ENDL;
 
diff --git a/indra/llcharacter/llkeyframemotionparam.cpp b/indra/llcharacter/llkeyframemotionparam.cpp
index c80aabe294..88c1a7ebe4 100644
--- a/indra/llcharacter/llkeyframemotionparam.cpp
+++ b/indra/llcharacter/llkeyframemotionparam.cpp
@@ -143,7 +143,7 @@ BOOL LLKeyframeMotionParam::onActivate()
 			paramMotion.mMotion->activate(mActivationTimestamp);
 		}
 	}
-	return TRUE;
+	return true;
 }
 
 
@@ -262,7 +262,7 @@ BOOL LLKeyframeMotionParam::onUpdate(F32 time, U8* joint_mask)
 
 	LL_INFOS() << "Param Motion weight " << mPoseBlender.getBlendedPose()->getWeight() << LL_ENDL;
 
-	return TRUE;
+	return true;
 }
 
 //-----------------------------------------------------------------------------
@@ -289,7 +289,7 @@ BOOL LLKeyframeMotionParam::addKeyframeMotion(char *name, const LLUUID &id, char
 	
 	if (!newMotion)
 	{
-		return FALSE;
+		return false;
 	}
 	
 	newMotion->setName(name);
@@ -297,7 +297,7 @@ BOOL LLKeyframeMotionParam::addKeyframeMotion(char *name, const LLUUID &id, char
 	// now add motion to this list
 	mParameterizedMotions[param].insert(ParameterizedMotion(newMotion, value));
 
-	return TRUE;
+	return true;
 }
 
 
@@ -344,7 +344,7 @@ BOOL LLKeyframeMotionParam::loadMotions()
 	if (!fp || fileSize == 0)
 	{
 		LL_INFOS() << "ERROR: can't open: " << path << LL_ENDL;
-		return FALSE;
+		return false;
 	}
 
 	// allocate a text buffer
@@ -383,7 +383,7 @@ BOOL LLKeyframeMotionParam::loadMotions()
 	if ( error )
 	{
 		LL_INFOS() << "ERROR: error while reading from " << path << LL_ENDL;
-		return FALSE;
+		return false;
 	}
 
 	LL_INFOS() << "Loading parametric keyframe data for: " << getName() << LL_ENDL;
@@ -410,7 +410,7 @@ BOOL LLKeyframeMotionParam::loadMotions()
 		if ((num != 3))
 		{
 			LL_INFOS() << "WARNING: can't read parametric motion" << LL_ENDL;
-			return FALSE;
+			return false;
 		}
 
 		addKeyframeMotion(strA, gAnimLibrary.stringToAnimState(std::string(strA)), strB, floatA);
@@ -430,7 +430,7 @@ BOOL LLKeyframeMotionParam::loadMotions()
 		num = sscanf(p, "%79s %79s %f", strA, strB, &floatA);	/* Flawfinder: ignore */
 	}
 
-	return TRUE;
+	return true;
 }
 
 // End
diff --git a/indra/llcharacter/llkeyframemotionparam.h b/indra/llcharacter/llkeyframemotionparam.h
index 0fac3724d1..1911460972 100644
--- a/indra/llcharacter/llkeyframemotionparam.h
+++ b/indra/llcharacter/llkeyframemotionparam.h
@@ -68,7 +68,7 @@ public:
 
 	// motions must specify whether or not they loop
 	virtual BOOL getLoop() {
-		return TRUE;
+		return true;
 	}
 
 	// motions must report their total duration
diff --git a/indra/llcharacter/llkeyframestandmotion.cpp b/indra/llcharacter/llkeyframestandmotion.cpp
index 02c1d3cdbd..f99492fd47 100644
--- a/indra/llcharacter/llkeyframestandmotion.cpp
+++ b/indra/llcharacter/llkeyframestandmotion.cpp
@@ -166,7 +166,7 @@ BOOL LLKeyframeStandMotion::onUpdate(F32 time, U8* joint_mask)
 	BOOL status = LLKeyframeMotion::onUpdate(time, joint_mask);
 	if (!status)
 	{
-		return FALSE;
+		return false;
 	}
 
 	LLVector3 root_world_pos = mPelvisState->getJoint()->getParent()->getWorldPosition();
@@ -174,7 +174,7 @@ BOOL LLKeyframeStandMotion::onUpdate(F32 time, U8* joint_mask)
 	// have we received a valid world position for this avatar?
 	if (root_world_pos.isExactlyZero())
 	{
-		return TRUE;
+		return true;
 	}
 
 	//-------------------------------------------------------------------------
@@ -255,7 +255,7 @@ BOOL LLKeyframeStandMotion::onUpdate(F32 time, U8* joint_mask)
 	else if (mFrameNum < 2)
 	{
 		mFrameNum++;
-		return TRUE;
+		return true;
 	}
 
 	mFrameNum++;
@@ -336,7 +336,7 @@ BOOL LLKeyframeStandMotion::onUpdate(F32 time, U8* joint_mask)
 	//LL_INFOS() << "Stand drift amount " << (mCharacter->getCharacterPosition() - mLastGoodPosition).magVec() << LL_ENDL;
 
 //	LL_INFOS() << "DEBUG: " << speed << " : " << mTrackAnkles << LL_ENDL;
-	return TRUE;
+	return true;
 }
 
 // End
diff --git a/indra/llcharacter/llkeyframewalkmotion.cpp b/indra/llcharacter/llkeyframewalkmotion.cpp
index 298b37e60c..ae0a03925d 100644
--- a/indra/llcharacter/llkeyframewalkmotion.cpp
+++ b/indra/llcharacter/llkeyframewalkmotion.cpp
@@ -191,7 +191,7 @@ BOOL LLWalkAdjustMotion::onActivate()
 	F32 rightAnkleOffset = (mRightAnkleJoint->getWorldPosition() - mCharacter->getCharacterPosition()).magVec();
 	mAnkleOffset = llmax(leftAnkleOffset, rightAnkleOffset);
 
-	return TRUE;
+	return true;
 }
 
 //-----------------------------------------------------------------------------
@@ -315,7 +315,7 @@ BOOL LLWalkAdjustMotion::onUpdate(F32 time, U8* joint_mask)
 	// need to update *some* joint to keep this animation active
 	mPelvisState->setPosition(mPelvisOffset);
 
-	return TRUE;
+	return true;
 }
 
 //-----------------------------------------------------------------------------
@@ -367,7 +367,7 @@ BOOL LLFlyAdjustMotion::onActivate()
 	mPelvisState->setPosition(LLVector3::zero);
 	mPelvisState->setRotation(LLQuaternion::DEFAULT);
 	mRoll = 0.f;
-	return TRUE;
+	return true;
 }
 
 //-----------------------------------------------------------------------------
@@ -388,6 +388,6 @@ BOOL LLFlyAdjustMotion::onUpdate(F32 time, U8* joint_mask)
 	LLQuaternion roll(mRoll, LLVector3(0.f, 0.f, 1.f));
 	mPelvisState->setRotation(roll);
 
-	return TRUE;
+	return true;
 }
 
diff --git a/indra/llcharacter/llkeyframewalkmotion.h b/indra/llcharacter/llkeyframewalkmotion.h
index 0e8d21b765..cb76995995 100644
--- a/indra/llcharacter/llkeyframewalkmotion.h
+++ b/indra/llcharacter/llkeyframewalkmotion.h
@@ -104,7 +104,7 @@ public:
 	virtual void onDeactivate();
 	virtual BOOL onUpdate(F32 time, U8* joint_mask);
 	virtual LLJoint::JointPriority getPriority(){return LLJoint::HIGH_PRIORITY;}
-	virtual BOOL getLoop() { return TRUE; }
+	virtual BOOL getLoop() { return true; }
 	virtual F32 getDuration() { return 0.f; }
 	virtual F32 getEaseInDuration() { return 0.f; }
 	virtual F32 getEaseOutDuration() { return 0.f; }
@@ -154,7 +154,7 @@ public:
 	virtual void onDeactivate() {};
 	virtual BOOL onUpdate(F32 time, U8* joint_mask);
 	virtual LLJoint::JointPriority getPriority(){return LLJoint::HIGHER_PRIORITY;}
-	virtual BOOL getLoop() { return TRUE; }
+	virtual BOOL getLoop() { return true; }
 	virtual F32 getDuration() { return 0.f; }
 	virtual F32 getEaseInDuration() { return 0.f; }
 	virtual F32 getEaseOutDuration() { return 0.f; }
diff --git a/indra/llcharacter/llmotion.cpp b/indra/llcharacter/llmotion.cpp
index 697efc8157..e07f8c5686 100644
--- a/indra/llcharacter/llmotion.cpp
+++ b/indra/llcharacter/llmotion.cpp
@@ -171,7 +171,7 @@ void LLMotion::deactivate()
 
 BOOL LLMotion::canDeprecate()
 {
-	return TRUE;
+	return true;
 }
 
 // End
diff --git a/indra/llcharacter/llmotion.h b/indra/llcharacter/llmotion.h
index aaa9a146d7..62c381aeb7 100644
--- a/indra/llcharacter/llmotion.h
+++ b/indra/llcharacter/llmotion.h
@@ -208,8 +208,8 @@ public:
 	F32 getMinPixelArea() { return 0.f; }
 	
 	LLMotionInitStatus onInitialize(LLCharacter*) { LL_INFOS() << "LLTestMotion::onInitialize()" << LL_ENDL; return STATUS_SUCCESS; }
-	BOOL onActivate() { LL_INFOS() << "LLTestMotion::onActivate()" << LL_ENDL; return TRUE; }
-	BOOL onUpdate(F32 time, U8* joint_mask) { LL_INFOS() << "LLTestMotion::onUpdate(" << time << ")" << LL_ENDL; return TRUE; }
+	BOOL onActivate() { LL_INFOS() << "LLTestMotion::onActivate()" << LL_ENDL; return true; }
+	BOOL onUpdate(F32 time, U8* joint_mask) { LL_INFOS() << "LLTestMotion::onUpdate(" << time << ")" << LL_ENDL; return true; }
 	void onDeactivate() { LL_INFOS() << "LLTestMotion::onDeactivate()" << LL_ENDL; }
 };
 
@@ -225,7 +225,7 @@ public:
 	static LLMotion *create(const LLUUID &id) { return new LLNullMotion(id); }
 
 	// motions must specify whether or not they loop
-	/*virtual*/ BOOL getLoop() { return TRUE; }
+	/*virtual*/ BOOL getLoop() { return true; }
 
 	// motions must report their total duration
 	/*virtual*/ F32 getDuration() { return 1.f; }
@@ -253,12 +253,12 @@ public:
 	// called when a motion is activated
 	// must return TRUE to indicate success, or else
 	// it will be deactivated
-	/*virtual*/ BOOL onActivate() { return TRUE; }
+	/*virtual*/ BOOL onActivate() { return true; }
 
 	// called per time step
 	// must return TRUE while it is active, and
 	// must return FALSE when the motion is completed.
-	/*virtual*/ BOOL onUpdate(F32 activeTime, U8* joint_mask) { return TRUE; }
+	/*virtual*/ BOOL onUpdate(F32 activeTime, U8* joint_mask) { return true; }
 
 	// called when a motion is deactivated
 	/*virtual*/ void onDeactivate() {}
diff --git a/indra/llcharacter/llmotioncontroller.cpp b/indra/llcharacter/llmotioncontroller.cpp
index 96e0d5e8d7..750547da93 100644
--- a/indra/llcharacter/llmotioncontroller.cpp
+++ b/indra/llcharacter/llmotioncontroller.cpp
@@ -82,10 +82,10 @@ BOOL LLMotionRegistry::registerMotion( const LLUUID& id, LLMotionConstructor con
 	if (!is_in_map(mMotionTable, id))
 	{
 		mMotionTable[id] = constructor;
-		return TRUE;
+		return true;
 	}
 	
-	return FALSE;
+	return false;
 }
 
 //-----------------------------------------------------------------------------
@@ -415,12 +415,12 @@ BOOL LLMotionController::startMotion(const LLUUID &id, F32 start_offset)
 
 	if (!motion)
 	{
-		return FALSE;
+		return false;
 	}
 	//if the motion is already active and allows deprecation, then let it keep playing
 	else if (motion->canDeprecate() && isMotionActive(motion))
 	{	
-		return TRUE;
+		return true;
 	}
 
 //	LL_INFOS() << "Starting motion " << name << LL_ENDL;
@@ -443,7 +443,7 @@ BOOL LLMotionController::stopMotionInstance(LLMotion* motion, BOOL stop_immediat
 {
 	if (!motion)
 	{
-		return FALSE;
+		return false;
 	}
 
 	
@@ -455,15 +455,15 @@ BOOL LLMotionController::stopMotionInstance(LLMotion* motion, BOOL stop_immediat
 		{
 			deactivateMotionInstance(motion);
 		}
-		return TRUE;
+		return true;
 	}
 	else if (isMotionLoading(motion))
 	{
 		motion->setStopped(TRUE);
-		return TRUE;
+		return true;
 	}
 
-	return FALSE;
+	return false;
 }
 
 //-----------------------------------------------------------------------------
@@ -926,7 +926,7 @@ BOOL LLMotionController::activateMotionInstance(LLMotion *motion, F32 time)
 	// hopefully this fixes it.
 	if (motion == NULL || motion->getPose() == NULL)
 	{
-		return FALSE;	
+		return false;
 	}
 
 	if (mLoadingMotions.find(motion) != mLoadingMotions.end())
@@ -934,7 +934,7 @@ BOOL LLMotionController::activateMotionInstance(LLMotion *motion, F32 time)
 		// we want to start this motion, but we can't yet, so flag it as started
 		motion->setStopped(FALSE);
 		// report pending animations as activated
-		return TRUE;
+		return true;
 	}
 
 	motion->mResidualWeight = motion->getPose()->getWeight();
@@ -978,7 +978,7 @@ BOOL LLMotionController::activateMotionInstance(LLMotion *motion, F32 time)
 		}
 	}
 	
-	return TRUE;
+	return true;
 }
 
 //-----------------------------------------------------------------------------
@@ -1001,7 +1001,7 @@ BOOL LLMotionController::deactivateMotionInstance(LLMotion *motion)
 		mActiveMotions.remove(motion);
 	}
 
-	return TRUE;
+	return true;
 }
 
 void LLMotionController::deprecateMotionInstance(LLMotion* motion)
diff --git a/indra/llcharacter/llmultigesture.cpp b/indra/llcharacter/llmultigesture.cpp
index 7ed242f90a..2938bf9473 100644
--- a/indra/llcharacter/llmultigesture.cpp
+++ b/indra/llcharacter/llmultigesture.cpp
@@ -133,10 +133,10 @@ BOOL LLMultiGesture::serialize(LLDataPacker& dp) const
 		BOOL ok = step->serialize(dp);
 		if (!ok)
 		{
-			return FALSE;
+			return false;
 		}
 	}
-	return TRUE;
+	return true;
 }
 
 BOOL LLMultiGesture::deserialize(LLDataPacker& dp)
@@ -148,7 +148,7 @@ BOOL LLMultiGesture::deserialize(LLDataPacker& dp)
 		LL_WARNS() << "Bad LLMultiGesture version " << version
 			<< " should be " << GESTURE_VERSION
 			<< LL_ENDL;
-		return FALSE;
+		return false;
 	}
 
 	dp.unpackU8(mKey, "key");
@@ -164,7 +164,7 @@ BOOL LLMultiGesture::deserialize(LLDataPacker& dp)
 	if (count < 0)
 	{
 		LL_WARNS() << "Bad LLMultiGesture step count " << count << LL_ENDL;
-		return FALSE;
+		return false;
 	}
 
 	S32 i;
@@ -180,7 +180,7 @@ BOOL LLMultiGesture::deserialize(LLDataPacker& dp)
 			{
 				LLGestureStepAnimation* step = new LLGestureStepAnimation();
 				BOOL ok = step->deserialize(dp);
-				if (!ok) return FALSE;
+				if (!ok) return false;
 				mSteps.push_back(step);
 				break;
 			}
@@ -188,7 +188,7 @@ BOOL LLMultiGesture::deserialize(LLDataPacker& dp)
 			{
 				LLGestureStepSound* step = new LLGestureStepSound();
 				BOOL ok = step->deserialize(dp);
-				if (!ok) return FALSE;
+				if (!ok) return false;
 				mSteps.push_back(step);
 				break;
 			}
@@ -196,7 +196,7 @@ BOOL LLMultiGesture::deserialize(LLDataPacker& dp)
 			{
 				LLGestureStepChat* step = new LLGestureStepChat();
 				BOOL ok = step->deserialize(dp);
-				if (!ok) return FALSE;
+				if (!ok) return false;
 				mSteps.push_back(step);
 				break;
 			}
@@ -204,18 +204,18 @@ BOOL LLMultiGesture::deserialize(LLDataPacker& dp)
 			{
 				LLGestureStepWait* step = new LLGestureStepWait();
 				BOOL ok = step->deserialize(dp);
-				if (!ok) return FALSE;
+				if (!ok) return false;
 				mSteps.push_back(step);
 				break;
 			}
 		default:
 			{
 				LL_WARNS() << "Bad LLMultiGesture step type " << type << LL_ENDL;
-				return FALSE;
+				return false;
 			}
 		}
 	}
-	return TRUE;
+	return true;
 }
 
 void LLMultiGesture::dump()
@@ -267,7 +267,7 @@ BOOL LLGestureStepAnimation::serialize(LLDataPacker& dp) const
 	dp.packString(mAnimName, "anim_name");
 	dp.packUUID(mAnimAssetID, "asset_id");
 	dp.packU32(mFlags, "flags");
-	return TRUE;
+	return true;
 }
 
 BOOL LLGestureStepAnimation::deserialize(LLDataPacker& dp)
@@ -284,7 +284,7 @@ BOOL LLGestureStepAnimation::deserialize(LLDataPacker& dp)
 
 	dp.unpackUUID(mAnimAssetID, "asset_id");
 	dp.unpackU32(mFlags, "flags");
-	return TRUE;
+	return true;
 }
 // *NOTE: result is translated in LLPreviewGesture::getLabel()
 std::vector<std::string> LLGestureStepAnimation::getLabel() const 
@@ -349,7 +349,7 @@ BOOL LLGestureStepSound::serialize(LLDataPacker& dp) const
 	dp.packString(mSoundName, "sound_name");
 	dp.packUUID(mSoundAssetID, "asset_id");
 	dp.packU32(mFlags, "flags");
-	return TRUE;
+	return true;
 }
 
 BOOL LLGestureStepSound::deserialize(LLDataPacker& dp)
@@ -358,7 +358,7 @@ BOOL LLGestureStepSound::deserialize(LLDataPacker& dp)
 
 	dp.unpackUUID(mSoundAssetID, "asset_id");
 	dp.unpackU32(mFlags, "flags");
-	return TRUE;
+	return true;
 }
 // *NOTE: result is translated in LLPreviewGesture::getLabel()
 std::vector<std::string> LLGestureStepSound::getLabel() const
@@ -408,7 +408,7 @@ BOOL LLGestureStepChat::serialize(LLDataPacker& dp) const
 {
 	dp.packString(mChatText, "chat_text");
 	dp.packU32(mFlags, "flags");
-	return TRUE;
+	return true;
 }
 
 BOOL LLGestureStepChat::deserialize(LLDataPacker& dp)
@@ -416,7 +416,7 @@ BOOL LLGestureStepChat::deserialize(LLDataPacker& dp)
 	dp.unpackString(mChatText, "chat_text");
 
 	dp.unpackU32(mFlags, "flags");
-	return TRUE;
+	return true;
 }
 // *NOTE: result is translated in LLPreviewGesture::getLabel()
 std::vector<std::string> LLGestureStepChat::getLabel() const
@@ -463,14 +463,14 @@ BOOL LLGestureStepWait::serialize(LLDataPacker& dp) const
 {
 	dp.packF32(mWaitSeconds, "wait_seconds");
 	dp.packU32(mFlags, "flags");
-	return TRUE;
+	return true;
 }
 
 BOOL LLGestureStepWait::deserialize(LLDataPacker& dp)
 {
 	dp.unpackF32(mWaitSeconds, "wait_seconds");
 	dp.unpackU32(mFlags, "flags");
-	return TRUE;
+	return true;
 }
 // *NOTE: result is translated in LLPreviewGesture::getLabel()
 std::vector<std::string> LLGestureStepWait::getLabel() const
diff --git a/indra/llcharacter/llpose.cpp b/indra/llcharacter/llpose.cpp
index 6f41a0e747..5acdfbf532 100644
--- a/indra/llcharacter/llpose.cpp
+++ b/indra/llcharacter/llpose.cpp
@@ -87,7 +87,7 @@ BOOL LLPose::addJointState(const LLPointer<LLJointState>& jointState)
 	{
 		mJointMap[jointState->getJoint()->getName()] = jointState;
 	}
-	return TRUE;
+	return true;
 }
 
 //-----------------------------------------------------------------------------
@@ -96,7 +96,7 @@ BOOL LLPose::addJointState(const LLPointer<LLJointState>& jointState)
 BOOL LLPose::removeJointState(const LLPointer<LLJointState>& jointState)
 {
 	mJointMap.erase(jointState->getJoint()->getName());
-	return TRUE;
+	return true;
 }
 
 //-----------------------------------------------------------------------------
@@ -105,7 +105,7 @@ BOOL LLPose::removeJointState(const LLPointer<LLJointState>& jointState)
 BOOL LLPose::removeAllJointStates()
 {
 	mJointMap.clear();
-	return TRUE;
+	return true;
 }
 
 //-----------------------------------------------------------------------------
@@ -199,7 +199,7 @@ BOOL LLJointStateBlender::addJointState(const LLPointer<LLJointState>& joint_sta
 
 	if (!joint_state->getJoint())
 		// this joint state doesn't point to an actual joint, so we don't care about applying it
-		return FALSE;
+		return false;
 
 	for(S32 i = 0; i < JSB_NUM_JOINT_STATES; i++)
 	{
@@ -208,7 +208,7 @@ BOOL LLJointStateBlender::addJointState(const LLPointer<LLJointState>& joint_sta
 			mJointStates[i] = joint_state;
 			mPriorities[i] = priority;
 			mAdditiveBlends[i] = additive_blend;
-			return TRUE;
+			return true;
 		} 
 		else if (priority > mPriorities[i])
 		{
@@ -225,11 +225,11 @@ BOOL LLJointStateBlender::addJointState(const LLPointer<LLJointState>& joint_sta
 			mJointStates[i] = joint_state;
 			mPriorities[i] = priority;
 			mAdditiveBlends[i] = additive_blend;
-			return TRUE;
+			return true;
 		}
 	}
 
-	return FALSE;
+	return false;
 }
 
 //-----------------------------------------------------------------------------
@@ -503,7 +503,7 @@ BOOL LLPoseBlender::addMotion(LLMotion* motion)
 			mActiveBlenders.push_front(joint_blender);
 		}
 	}
-	return TRUE;
+	return true;
 }
 
 //-----------------------------------------------------------------------------
diff --git a/indra/llcharacter/llstatemachine.cpp b/indra/llcharacter/llstatemachine.cpp
index 2e8214ffaf..30f37ce0c2 100644
--- a/indra/llcharacter/llstatemachine.cpp
+++ b/indra/llcharacter/llstatemachine.cpp
@@ -61,7 +61,7 @@ LLStateDiagram::~LLStateDiagram()
 BOOL LLStateDiagram::addState(LLFSMState *state)
 {
 	mStates[state] = Transitions();
-	return TRUE;
+	return true;
 }
 
 // add a directed transition between 2 states
@@ -93,7 +93,7 @@ BOOL LLStateDiagram::addTransition(LLFSMState& start_state, LLFSMState& end_stat
 	}
 
 	(*state_transitions)[&transition] = &end_state;
-	return TRUE;
+	return true;
 }
 
 // add an undirected transition between 2 states
@@ -183,7 +183,7 @@ BOOL LLStateDiagram::stateIsValid(LLFSMState& state)
 {
 	if (mStates.find(&state) != mStates.end())
 	{
-		return TRUE;
+		return true;
 	}
 	return FALSE;
 }
@@ -248,7 +248,7 @@ BOOL LLStateDiagram::saveDotFile(const std::string& filename)
 
 	apr_file_printf(dot_file, "}\n");
 
-	return TRUE;
+	return true;
 }
 
 std::ostream& operator<<(std::ostream &s, LLStateDiagram &FSM)
@@ -319,7 +319,7 @@ BOOL LLStateMachine::setCurrentState(LLFSMState *initial_state, void* user_data,
 		{
 			initial_state->onEntry(user_data);
 		}
-		return TRUE;
+		return true;
 	}
 
 	return FALSE;
@@ -338,7 +338,7 @@ BOOL LLStateMachine::setCurrentState(U32 state_id, void* user_data, BOOL skip_en
 		{
 			state->onEntry(user_data);
 		}
-		return TRUE;
+		return true;
 	}
 
 	return FALSE;
diff --git a/indra/llcharacter/lltargetingmotion.cpp b/indra/llcharacter/lltargetingmotion.cpp
index ec75212a40..0697d04fd3 100644
--- a/indra/llcharacter/lltargetingmotion.cpp
+++ b/indra/llcharacter/lltargetingmotion.cpp
@@ -95,7 +95,7 @@ LLMotion::LLMotionInitStatus LLTargetingMotion::onInitialize(LLCharacter *charac
 //-----------------------------------------------------------------------------
 BOOL LLTargetingMotion::onActivate()
 {
-	return TRUE;
+	return true;
 }
 
 //-----------------------------------------------------------------------------
@@ -113,7 +113,7 @@ BOOL LLTargetingMotion::onUpdate(F32 time, U8* joint_mask)
 
 	if (!lookAtPoint)
 	{
-		return TRUE;
+		return true;
 	}
 	else
 	{
diff --git a/indra/llcharacter/lltargetingmotion.h b/indra/llcharacter/lltargetingmotion.h
index 0971417e1e..b9b838c197 100644
--- a/indra/llcharacter/lltargetingmotion.h
+++ b/indra/llcharacter/lltargetingmotion.h
@@ -66,7 +66,7 @@ public:
 	//-------------------------------------------------------------------------
 
 	// motions must specify whether or not they loop
-	virtual BOOL getLoop() { return TRUE; }
+	virtual BOOL getLoop() { return true; }
 
 	// motions must report their total duration
 	virtual F32 getDuration() { return 0.0; }
diff --git a/indra/llcharacter/llvisualparam.cpp b/indra/llcharacter/llvisualparam.cpp
index 2235496ac5..9976de9f6f 100644
--- a/indra/llcharacter/llvisualparam.cpp
+++ b/indra/llcharacter/llvisualparam.cpp
@@ -138,7 +138,7 @@ BOOL LLVisualParamInfo::parseXml(LLXmlTreeNode *node)
 		mMaxName = "More";
 	}
 
-	return TRUE;
+	return true;
 }
 
 //virtual
@@ -215,7 +215,7 @@ BOOL LLVisualParam::setInfo(LLVisualParamInfo *info)
 	mInfo = info;
 	mID = info->mID;
 	setWeight(getDefaultWeight(), FALSE );
-	return TRUE;
+	return true;
 }
 
 //-----------------------------------------------------------------------------
@@ -229,7 +229,7 @@ BOOL LLVisualParam::parseData(LLXmlTreeNode *node)
 	if (!setInfo(info))
 		return FALSE;
 	
-	return TRUE;
+	return true;
 }
 */
 
@@ -336,7 +336,7 @@ void LLVisualParam::stopAnimating()
 BOOL LLVisualParam::linkDrivenParams(visual_param_mapper mapper, BOOL only_cross_params)
 {
 	// nothing to do for non-driver parameters
-	return TRUE;
+	return true;
 }
 
 //virtual