more misc: BOOL (int) to real bool

82 files changed, 234 insertions, 234 deletions

diff --git a/indra/llappearance/llavatarjoint.cpp b/indra/llappearance/llavatarjoint.cpp
index 9300b08b7b..a1f775c801 100644
--- a/indra/llappearance/llavatarjoint.cpp
+++ b/indra/llappearance/llavatarjoint.cpp
@@ -167,10 +167,10 @@ void LLAvatarJoint::updateJointGeometry()
 }
 
 
-BOOL LLAvatarJoint::updateLOD(F32 pixel_area, BOOL activate)
+bool LLAvatarJoint::updateLOD(F32 pixel_area, bool activate)
 {
-	BOOL lod_changed = FALSE;
-	BOOL found_lod = FALSE;
+	bool lod_changed = FALSE;
+	bool found_lod = FALSE;
 
 	for (LLJoint* child : mChildren)
 	{
diff --git a/indra/llappearance/llavatarjoint.h b/indra/llappearance/llavatarjoint.h
index 61b4e2b0a1..052852fa3d 100644
--- a/indra/llappearance/llavatarjoint.h
+++ b/indra/llappearance/llavatarjoint.h
@@ -62,7 +62,7 @@ public:
 	virtual BOOL isTransparent() { return mIsTransparent; }
 
 	// Returns true if this object should inherit scale modifiers from its immediate parent
-	virtual BOOL inheritScale() { return false; }
+	virtual bool inheritScale() { return false; }
 
 	enum Components
 	{
@@ -99,7 +99,7 @@ public:
 	virtual U32 render( F32 pixelArea, BOOL first_pass = TRUE, BOOL is_dummy = FALSE ) = 0;
 	virtual void updateFaceSizes(U32 &num_vertices, U32& num_indices, F32 pixel_area);
 	virtual void updateFaceData(LLFace *face, F32 pixel_area, BOOL damp_wind = FALSE, bool terse_update = false);
-	virtual BOOL updateLOD(F32 pixel_area, BOOL activate);
+	virtual bool updateLOD(F32 pixel_area, bool activate);
 	virtual void updateJointGeometry();
 	virtual void dump();
 	
@@ -127,7 +127,7 @@ public:
 	LLAvatarJointCollisionVolume();
 	virtual ~LLAvatarJointCollisionVolume() {};
 
-	/*virtual*/ BOOL inheritScale() { return true; }
+	/*virtual*/ bool inheritScale() { return true; }
 	/*virtual*/ U32 render( F32 pixelArea, BOOL first_pass = TRUE, BOOL is_dummy = FALSE );
 
 	void renderCollision();
diff --git a/indra/llappearance/llavatarjointmesh.cpp b/indra/llappearance/llavatarjointmesh.cpp
index 7a6da9d33f..97539afba6 100644
--- a/indra/llappearance/llavatarjointmesh.cpp
+++ b/indra/llappearance/llavatarjointmesh.cpp
@@ -102,7 +102,7 @@ LLSkinJoint::~LLSkinJoint()
 //-----------------------------------------------------------------------------
 // LLSkinJoint::setupSkinJoint()
 //-----------------------------------------------------------------------------
-BOOL LLSkinJoint::setupSkinJoint( LLAvatarJoint *joint)
+bool LLSkinJoint::setupSkinJoint( LLAvatarJoint *joint)
 {
 	// find the named joint
 	mJoint = joint;
@@ -182,7 +182,7 @@ LLAvatarJointMesh::~LLAvatarJointMesh()
 //-----------------------------------------------------------------------------
 // LLAvatarJointMesh::allocateSkinData()
 //-----------------------------------------------------------------------------
-BOOL LLAvatarJointMesh::allocateSkinData( U32 numSkinJoints )
+bool LLAvatarJointMesh::allocateSkinData( U32 numSkinJoints )
 {
 	mSkinJoints = new LLSkinJoint[ numSkinJoints ];
 	mNumSkinJoints = numSkinJoints;
diff --git a/indra/llappearance/llavatarjointmesh.h b/indra/llappearance/llavatarjointmesh.h
index 5980b29b46..1f12c3986f 100644
--- a/indra/llappearance/llavatarjointmesh.h
+++ b/indra/llappearance/llavatarjointmesh.h
@@ -49,7 +49,7 @@ class LLSkinJoint
 public:
 	LLSkinJoint();
 	~LLSkinJoint();
-	BOOL setupSkinJoint( LLAvatarJoint *joint);
+	bool setupSkinJoint( LLAvatarJoint *joint);
 
 	LLAvatarJoint	*mJoint;
 	LLVector3		mRootToJointSkinOffset;
@@ -135,7 +135,7 @@ public:
 
 private:
 	// Allocate skin data
-	BOOL allocateSkinData( U32 numSkinJoints );
+	bool allocateSkinData( U32 numSkinJoints );
 
 	// Free skin data
 	void freeSkinData();
diff --git a/indra/llappearance/lldriverparam.cpp b/indra/llappearance/lldriverparam.cpp
index 52d060571e..84b7c9ac41 100644
--- a/indra/llappearance/lldriverparam.cpp
+++ b/indra/llappearance/lldriverparam.cpp
@@ -41,7 +41,7 @@ LLDriverParamInfo::LLDriverParamInfo() :
 {
 }
 
-BOOL LLDriverParamInfo::parseXml(LLXmlTreeNode* node)
+bool LLDriverParamInfo::parseXml(LLXmlTreeNode* node)
 {
 	llassert( node->hasName( "param" ) && node->getChildByName( "param_driver" ) );
 
diff --git a/indra/llappearance/lldriverparam.h b/indra/llappearance/lldriverparam.h
index a6261b507b..915faf6b5d 100644
--- a/indra/llappearance/lldriverparam.h
+++ b/indra/llappearance/lldriverparam.h
@@ -65,7 +65,7 @@ public:
 	LLDriverParamInfo();
 	/*virtual*/ ~LLDriverParamInfo() {};
 	
-	/*virtual*/ BOOL parseXml(LLXmlTreeNode* node);
+	/*virtual*/ bool parseXml(LLXmlTreeNode* node);
 
 	/*virtual*/ void toStream(std::ostream &out);	
 
diff --git a/indra/llappearance/llpolymorph.cpp b/indra/llappearance/llpolymorph.cpp
index c2f0289432..697beb239e 100644
--- a/indra/llappearance/llpolymorph.cpp
+++ b/indra/llappearance/llpolymorph.cpp
@@ -260,7 +260,7 @@ LLPolyMorphTargetInfo::LLPolyMorphTargetInfo()
 {
 }
 
-BOOL LLPolyMorphTargetInfo::parseXml(LLXmlTreeNode* node)
+bool LLPolyMorphTargetInfo::parseXml(LLXmlTreeNode* node)
 {
 	llassert( node->hasName( "param" ) && node->getChildByName( "param_morph" ) );
 
diff --git a/indra/llappearance/llpolymorph.h b/indra/llappearance/llpolymorph.h
index 954f01811a..8388898dd6 100644
--- a/indra/llappearance/llpolymorph.h
+++ b/indra/llappearance/llpolymorph.h
@@ -129,7 +129,7 @@ public:
 	LLPolyMorphTargetInfo();
 	/*virtual*/ ~LLPolyMorphTargetInfo() {};
 	
-	/*virtual*/ BOOL parseXml(LLXmlTreeNode* node);
+	/*virtual*/ bool parseXml(LLXmlTreeNode* node);
 
 protected:
 	std::string		mMorphName;
diff --git a/indra/llappearance/llpolyskeletaldistortion.cpp b/indra/llappearance/llpolyskeletaldistortion.cpp
index d3401cb08f..d730bab107 100644
--- a/indra/llappearance/llpolyskeletaldistortion.cpp
+++ b/indra/llappearance/llpolyskeletaldistortion.cpp
@@ -45,7 +45,7 @@ LLPolySkeletalDistortionInfo::LLPolySkeletalDistortionInfo()
 {
 }
 
-BOOL LLPolySkeletalDistortionInfo::parseXml(LLXmlTreeNode* node)
+bool LLPolySkeletalDistortionInfo::parseXml(LLXmlTreeNode* node)
 {
         llassert( node->hasName( "param" ) && node->getChildByName( "param_skeleton" ) );
         
@@ -68,7 +68,7 @@ BOOL LLPolySkeletalDistortionInfo::parseXml(LLXmlTreeNode* node)
                         std::string name;
                         LLVector3 scale;
                         LLVector3 pos;
-                        BOOL haspos = FALSE;
+                        BOOL haspos = false;
                         
                         static LLStdStringHandle name_string = LLXmlTree::addAttributeString("name");
                         if (!bone->getFastAttributeString(name_string, name))
@@ -88,7 +88,7 @@ BOOL LLPolySkeletalDistortionInfo::parseXml(LLXmlTreeNode* node)
                         static LLStdStringHandle offset_string = LLXmlTree::addAttributeString("offset");
                         if (bone->getFastAttributeVector3(offset_string, pos))
                         {
-                                haspos = TRUE;
+                                haspos = true;
                         }
                         mBoneInfoList.push_back(LLPolySkeletalBoneInfo(name, scale, pos, haspos));
                 }
diff --git a/indra/llappearance/llpolyskeletaldistortion.h b/indra/llappearance/llpolyskeletaldistortion.h
index 585d85f055..4aa053b924 100644
--- a/indra/llappearance/llpolyskeletaldistortion.h
+++ b/indra/llappearance/llpolyskeletaldistortion.h
@@ -71,7 +71,7 @@ public:
 	LLPolySkeletalDistortionInfo();
 	/*virtual*/ ~LLPolySkeletalDistortionInfo() {};
 	
-	/*virtual*/ BOOL parseXml(LLXmlTreeNode* node);
+	/*virtual*/ bool parseXml(LLXmlTreeNode* node);
 
 protected:
 	typedef std::vector<LLPolySkeletalBoneInfo> bone_info_list_t;
diff --git a/indra/llappearance/lltexglobalcolor.cpp b/indra/llappearance/lltexglobalcolor.cpp
index 9017067f98..eea7639cd8 100644
--- a/indra/llappearance/lltexglobalcolor.cpp
+++ b/indra/llappearance/lltexglobalcolor.cpp
@@ -135,7 +135,7 @@ LLTexGlobalColorInfo::~LLTexGlobalColorInfo()
 	mParamColorInfoList.clear();
 }
 
-BOOL LLTexGlobalColorInfo::parseXml(LLXmlTreeNode* node)
+bool LLTexGlobalColorInfo::parseXml(LLXmlTreeNode* node)
 {
 	// name attribute
 	static LLStdStringHandle name_string = LLXmlTree::addAttributeString("name");
diff --git a/indra/llappearance/lltexglobalcolor.h b/indra/llappearance/lltexglobalcolor.h
index 3b426053de..94cb979255 100644
--- a/indra/llappearance/lltexglobalcolor.h
+++ b/indra/llappearance/lltexglobalcolor.h
@@ -62,7 +62,7 @@ public:
 	LLTexGlobalColorInfo();
 	~LLTexGlobalColorInfo();
 
-	BOOL parseXml(LLXmlTreeNode* node);
+	bool parseXml(LLXmlTreeNode* node);
 
 private:
 	param_color_info_list_t		mParamColorInfoList;
diff --git a/indra/llappearance/lltexlayer.cpp b/indra/llappearance/lltexlayer.cpp
index 91f5ba1996..73ce5257e5 100644
--- a/indra/llappearance/lltexlayer.cpp
+++ b/indra/llappearance/lltexlayer.cpp
@@ -59,7 +59,7 @@ public:
 	LLTexLayerInfo();
 	~LLTexLayerInfo();
 
-	BOOL parseXml(LLXmlTreeNode* node);
+	bool parseXml(LLXmlTreeNode* node);
 	BOOL createVisualParams(LLAvatarAppearance *appearance);
 	BOOL isUserSettable() { return mLocalTexture != -1;	}
 	S32  getLocalTexture() const { return mLocalTexture; }
@@ -185,7 +185,7 @@ LLTexLayerSetInfo::~LLTexLayerSetInfo( )
 	mLayerInfoList.clear();
 }
 
-BOOL LLTexLayerSetInfo::parseXml(LLXmlTreeNode* node)
+bool LLTexLayerSetInfo::parseXml(LLXmlTreeNode* node)
 {
 	llassert( node->hasName( "layer_set" ) );
 	if( !node->hasName( "layer_set" ) )
@@ -579,7 +579,7 @@ LLTexLayerInfo::~LLTexLayerInfo( )
 	mParamAlphaInfoList.clear();
 }
 
-BOOL LLTexLayerInfo::parseXml(LLXmlTreeNode* node)
+bool LLTexLayerInfo::parseXml(LLXmlTreeNode* node)
 {
 	llassert( node->hasName( "layer" ) );
 
diff --git a/indra/llappearance/lltexlayer.h b/indra/llappearance/lltexlayer.h
index ff95d7f5e9..2cca2b6b12 100644
--- a/indra/llappearance/lltexlayer.h
+++ b/indra/llappearance/lltexlayer.h
@@ -243,7 +243,7 @@ class LLTexLayerSetInfo
 public:
 	LLTexLayerSetInfo();
 	~LLTexLayerSetInfo();
-	BOOL parseXml(LLXmlTreeNode* node);
+	bool parseXml(LLXmlTreeNode* node);
 	void createVisualParams(LLAvatarAppearance *appearance);
 	S32 getWidth() const { return mWidth; }
 	S32 getHeight() const { return mHeight; }
diff --git a/indra/llappearance/lltexlayerparams.cpp b/indra/llappearance/lltexlayerparams.cpp
index 16369533ca..4cfbdc01c1 100644
--- a/indra/llappearance/lltexlayerparams.cpp
+++ b/indra/llappearance/lltexlayerparams.cpp
@@ -378,7 +378,7 @@ LLTexLayerParamAlphaInfo::LLTexLayerParamAlphaInfo() :
 {
 }
 
-BOOL LLTexLayerParamAlphaInfo::parseXml(LLXmlTreeNode* node)
+bool LLTexLayerParamAlphaInfo::parseXml(LLXmlTreeNode* node)
 {
 	llassert(node->hasName("param") && node->getChildByName("param_alpha"));
 
@@ -538,7 +538,7 @@ LLTexLayerParamColorInfo::LLTexLayerParamColorInfo() :
 {
 }
 
-BOOL LLTexLayerParamColorInfo::parseXml(LLXmlTreeNode *node)
+bool LLTexLayerParamColorInfo::parseXml(LLXmlTreeNode *node)
 {
 	llassert(node->hasName("param") && node->getChildByName("param_color"));
 
diff --git a/indra/llappearance/lltexlayerparams.h b/indra/llappearance/lltexlayerparams.h
index 000f55685e..1dbfd0b3d6 100644
--- a/indra/llappearance/lltexlayerparams.h
+++ b/indra/llappearance/lltexlayerparams.h
@@ -120,7 +120,7 @@ public:
 	LLTexLayerParamAlphaInfo();
 	/*virtual*/ ~LLTexLayerParamAlphaInfo() {};
 
-	/*virtual*/ BOOL parseXml(LLXmlTreeNode* node);
+	/*virtual*/ bool parseXml(LLXmlTreeNode* node);
 
 private:
 	std::string				mStaticImageFileName;
@@ -189,7 +189,7 @@ class LLTexLayerParamColorInfo : public LLViewerVisualParamInfo
 public:
 	LLTexLayerParamColorInfo();
 	virtual ~LLTexLayerParamColorInfo() {};
-	BOOL parseXml( LLXmlTreeNode* node );
+	bool parseXml( LLXmlTreeNode* node );
 	LLTexLayerParamColor::EColorOperation getOperation() const { return mOperation; }
 private:
 	enum { MAX_COLOR_VALUES = 20 };
diff --git a/indra/llappearance/llviewervisualparam.cpp b/indra/llappearance/llviewervisualparam.cpp
index 07786e3c0c..43fb8fab5e 100644
--- a/indra/llappearance/llviewervisualparam.cpp
+++ b/indra/llappearance/llviewervisualparam.cpp
@@ -57,7 +57,7 @@ LLViewerVisualParamInfo::~LLViewerVisualParamInfo()
 //-----------------------------------------------------------------------------
 // parseXml()
 //-----------------------------------------------------------------------------
-BOOL LLViewerVisualParamInfo::parseXml(LLXmlTreeNode *node)
+bool LLViewerVisualParamInfo::parseXml(LLXmlTreeNode *node)
 {
 	llassert( node->hasName( "param" ) );
 
diff --git a/indra/llappearance/llviewervisualparam.h b/indra/llappearance/llviewervisualparam.h
index 1a710c0ca6..9ad3e6eae8 100644
--- a/indra/llappearance/llviewervisualparam.h
+++ b/indra/llappearance/llviewervisualparam.h
@@ -43,7 +43,7 @@ public:
 	LLViewerVisualParamInfo();
 	/*virtual*/ ~LLViewerVisualParamInfo();
 	
-	/*virtual*/ BOOL parseXml(LLXmlTreeNode* node);
+	/*virtual*/ bool parseXml(LLXmlTreeNode* node);
 
 	/*virtual*/ void toStream(std::ostream &out);
 
diff --git a/indra/llcharacter/lleditingmotion.h b/indra/llcharacter/lleditingmotion.h
index 35d44c8761..63295983e0 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/llhandmotion.h b/indra/llcharacter/llhandmotion.h
index 074ee29de9..a37e50f595 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; }
@@ -119,7 +119,7 @@ public:
 	// called when a motion is deactivated
 	virtual void onDeactivate();
 
-	virtual BOOL canDeprecate() { return FALSE; }
+	virtual bool canDeprecate() { return false; }
 
 	static std::string getHandPoseName(eHandPose pose);
 	static eHandPose getHandPose(std::string posename);
diff --git a/indra/llcharacter/llheadrotmotion.h b/indra/llcharacter/llheadrotmotion.h
index 6b460fc22e..fbc0885039 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/llkeyframemotion.cpp b/indra/llcharacter/llkeyframemotion.cpp
index 0345212695..0c2893cf4d 100644
--- a/indra/llcharacter/llkeyframemotion.cpp
+++ b/indra/llcharacter/llkeyframemotion.cpp
@@ -645,7 +645,7 @@ BOOL LLKeyframeMotion::setupPose()
 		mPelvisp = mCharacter->getJoint("mPelvis");
 		if (!mPelvisp)
 		{
-			return FALSE;
+			return false;
 		}
 	}
 
@@ -1240,13 +1240,13 @@ BOOL LLKeyframeMotion::deserialize(LLDataPacker& dp, const LLUUID& asset_id, boo
 	if (!dp.unpackU16(version, "version"))
 	{
 		LL_WARNS() << "can't read version number for animation " << asset_id << LL_ENDL;
-		return FALSE;
+		return false;
 	}
 
 	if (!dp.unpackU16(sub_version, "sub_version"))
 	{
 		LL_WARNS() << "can't read sub version number for animation " << asset_id << LL_ENDL;
-		return FALSE;
+		return false;
 	}
 
 	if (version == 0 && sub_version == 1)
@@ -1258,7 +1258,7 @@ BOOL LLKeyframeMotion::deserialize(LLDataPacker& dp, const LLUUID& asset_id, boo
 #if LL_RELEASE
 		LL_WARNS() << "Bad animation version " << version << "." << sub_version 
                    << " for animation " << asset_id << LL_ENDL;
-		return FALSE;
+		return false;
 #else
 		LL_ERRS() << "Bad animation version " << version << "." << sub_version
                   << " for animation " << asset_id << LL_ENDL;
@@ -1269,7 +1269,7 @@ BOOL LLKeyframeMotion::deserialize(LLDataPacker& dp, const LLUUID& asset_id, boo
 	{
 		LL_WARNS() << "can't read animation base_priority"
                    << " for animation " << asset_id << LL_ENDL;
-		return FALSE;
+		return false;
 	}
 	joint_motion_list->mBasePriority = (LLJoint::JointPriority) temp_priority;
 
@@ -1282,7 +1282,7 @@ BOOL LLKeyframeMotion::deserialize(LLDataPacker& dp, const LLUUID& asset_id, boo
 	{
 		LL_WARNS() << "bad animation base_priority " << joint_motion_list->mBasePriority
                    << " for animation " << asset_id << LL_ENDL;
-		return FALSE;
+		return false;
 	}
 
 	//-------------------------------------------------------------------------
@@ -1292,7 +1292,7 @@ BOOL LLKeyframeMotion::deserialize(LLDataPacker& dp, const LLUUID& asset_id, boo
 	{
 		LL_WARNS() << "can't read duration"
                    << " for animation " << asset_id << LL_ENDL;
-		return FALSE;
+		return false;
 	}
 	
 	if (joint_motion_list->mDuration > MAX_ANIM_DURATION ||
@@ -1300,7 +1300,7 @@ BOOL LLKeyframeMotion::deserialize(LLDataPacker& dp, const LLUUID& asset_id, boo
 	{
 		LL_WARNS() << "invalid animation duration"
                    << " for animation " << asset_id << LL_ENDL;
-		return FALSE;
+		return false;
 	}
 
 	//-------------------------------------------------------------------------
@@ -1310,14 +1310,14 @@ BOOL LLKeyframeMotion::deserialize(LLDataPacker& dp, const LLUUID& asset_id, boo
 	{
 		LL_WARNS() << "can't read optional_emote_animation"
                    << " for animation " << asset_id << LL_ENDL;
-		return FALSE;
+		return false;
 	}
 
 	if(joint_motion_list->mEmoteName==mID.asString())
 	{
 		LL_WARNS() << "Malformed animation mEmoteName==mID"
                    << " for animation " << asset_id << LL_ENDL;
-		return FALSE;
+		return false;
 	}
 
 	//-------------------------------------------------------------------------
@@ -1328,7 +1328,7 @@ BOOL LLKeyframeMotion::deserialize(LLDataPacker& dp, const LLUUID& asset_id, boo
 	{
 		LL_WARNS() << "can't read loop point"
                    << " for animation " << asset_id << LL_ENDL;
-		return FALSE;
+		return false;
 	}
 
 	if (!dp.unpackF32(joint_motion_list->mLoopOutPoint, "loop_out_point") ||
@@ -1336,14 +1336,14 @@ BOOL LLKeyframeMotion::deserialize(LLDataPacker& dp, const LLUUID& asset_id, boo
 	{
 		LL_WARNS() << "can't read loop point"
                    << " for animation " << asset_id << LL_ENDL;
-		return FALSE;
+		return false;
 	}
 
 	if (!dp.unpackS32(joint_motion_list->mLoop, "loop"))
 	{
 		LL_WARNS() << "can't read loop"
                    << " for animation " << asset_id << LL_ENDL;
-		return FALSE;
+		return false;
 	}
 
 	//SL-17206 hack to alter Female_land loop setting, while current behavior won't be changed serverside
@@ -1363,7 +1363,7 @@ BOOL LLKeyframeMotion::deserialize(LLDataPacker& dp, const LLUUID& asset_id, boo
 	{
 		LL_WARNS() << "can't read easeIn"
                    << " for animation " << asset_id << LL_ENDL;
-		return FALSE;
+		return false;
 	}
 
 	if (!dp.unpackF32(joint_motion_list->mEaseOutDuration, "ease_out_duration") ||
@@ -1371,7 +1371,7 @@ BOOL LLKeyframeMotion::deserialize(LLDataPacker& dp, const LLUUID& asset_id, boo
 	{
 		LL_WARNS() << "can't read easeOut"
                    << " for animation " << asset_id << LL_ENDL;
-		return FALSE;
+		return false;
 	}
 
 	//-------------------------------------------------------------------------
@@ -1382,14 +1382,14 @@ BOOL LLKeyframeMotion::deserialize(LLDataPacker& dp, const LLUUID& asset_id, boo
 	{
 		LL_WARNS() << "can't read hand pose"
                    << " for animation " << asset_id << LL_ENDL;
-		return FALSE;
+		return false;
 	}
 	
 	if(word > LLHandMotion::NUM_HAND_POSES)
 	{
 		LL_WARNS() << "invalid LLHandMotion::eHandPose index: " << word
                    << " for animation " << asset_id << LL_ENDL;
-		return FALSE;
+		return false;
 	}
 	
 	joint_motion_list->mHandPose = (LLHandMotion::eHandPose)word;
@@ -1404,20 +1404,20 @@ BOOL LLKeyframeMotion::deserialize(LLDataPacker& dp, const LLUUID& asset_id, boo
 	{
 		LL_WARNS() << "can't read number of joints"
                    << " for animation " << asset_id << LL_ENDL;
-		return FALSE;
+		return false;
 	}
 
 	if (num_motions == 0)
 	{
 		LL_WARNS() << "no joints"
                    << " for animation " << asset_id << LL_ENDL;
-		return FALSE;
+		return false;
 	}
 	else if (num_motions > LL_CHARACTER_MAX_ANIMATED_JOINTS)
 	{
 		LL_WARNS() << "too many joints"
                    << " for animation " << asset_id << LL_ENDL;
-		return FALSE;
+		return false;
 	}
 
 	joint_motion_list->mJointMotionArray.clear();
@@ -1439,14 +1439,14 @@ BOOL LLKeyframeMotion::deserialize(LLDataPacker& dp, const LLUUID& asset_id, boo
 		{
 			LL_WARNS() << "can't read joint name"
                        << " for animation " << asset_id << LL_ENDL;
-			return FALSE;
+			return false;
 		}
 
 		if (joint_name == "mScreen" || joint_name == "mRoot")
 		{
 			LL_WARNS() << "attempted to animate special " << joint_name << " joint"
                        << " for animation " << asset_id << LL_ENDL;
-			return FALSE;
+			return false;
 		}
 				
 		//---------------------------------------------------------------------
@@ -1473,7 +1473,7 @@ BOOL LLKeyframeMotion::deserialize(LLDataPacker& dp, const LLUUID& asset_id, boo
                        << " for animation " << asset_id << LL_ENDL;
 			if (!allow_invalid_joints)
 			{
-				return FALSE;
+				return false;
 			}
 		}
 
@@ -1492,14 +1492,14 @@ BOOL LLKeyframeMotion::deserialize(LLDataPacker& dp, const LLUUID& asset_id, boo
 		{
 			LL_WARNS() << "can't read joint priority."
                        << " for animation " << asset_id << LL_ENDL;
-			return FALSE;
+			return false;
 		}
 
 		if (joint_priority < LLJoint::USE_MOTION_PRIORITY)
 		{
 			LL_WARNS() << "joint priority unknown - too low."
                        << " for animation " << asset_id << LL_ENDL;
-			return FALSE;
+			return false;
 		}
 		
 		joint_motion->mPriority = (LLJoint::JointPriority)joint_priority;
@@ -1518,7 +1518,7 @@ BOOL LLKeyframeMotion::deserialize(LLDataPacker& dp, const LLUUID& asset_id, boo
 		{
 			LL_WARNS() << "can't read number of rotation keys"
                        << " for animation " << asset_id << LL_ENDL;
-			return FALSE;
+			return false;
 		}
 
 		joint_motion->mRotationCurve.mInterpolationType = IT_LINEAR;
@@ -1544,7 +1544,7 @@ BOOL LLKeyframeMotion::deserialize(LLDataPacker& dp, const LLUUID& asset_id, boo
 				{
 					LL_WARNS() << "can't read rotation key (" << k << ")"
                                << " for animation " << asset_id << LL_ENDL;
-					return FALSE;
+					return false;
 				}
 
 			}
@@ -1554,7 +1554,7 @@ BOOL LLKeyframeMotion::deserialize(LLDataPacker& dp, const LLUUID& asset_id, boo
 				{
 					LL_WARNS() << "can't read rotation key (" << k << ")"
                                << " for animation " << asset_id << LL_ENDL;
-					return FALSE;
+					return false;
 				}
 
 				time = U16_to_F32(time_short, 0.f, joint_motion_list->mDuration);
@@ -1563,7 +1563,7 @@ BOOL LLKeyframeMotion::deserialize(LLDataPacker& dp, const LLUUID& asset_id, boo
 				{
 					LL_WARNS() << "invalid frame time"
                                << " for animation " << asset_id << LL_ENDL;
-					return FALSE;
+					return false;
 				}
 			}
 			
@@ -1577,12 +1577,12 @@ BOOL LLKeyframeMotion::deserialize(LLDataPacker& dp, const LLUUID& asset_id, boo
 				if (!dp.unpackVector3(rot_angles, "rot_angles"))
 				{
 					LL_WARNS() << "can't read rot_angles in rotation key (" << k << ")" << LL_ENDL;
-					return FALSE;
+					return false;
 				}
 				if (!rot_angles.isFinite())
 				{
 					LL_WARNS() << "non-finite angle in rotation key (" << k << ")" << LL_ENDL;
-					return FALSE;
+					return false;
 				}
 
 				LLQuaternion::Order ro = StringToOrder("ZYX");
@@ -1593,17 +1593,17 @@ BOOL LLKeyframeMotion::deserialize(LLDataPacker& dp, const LLUUID& asset_id, boo
 				if (!dp.unpackU16(x, "rot_angle_x"))
 				{
 					LL_WARNS() << "can't read rot_angle_x in rotation key (" << k << ")" << LL_ENDL;
-					return FALSE;
+					return false;
 				}
 				if (!dp.unpackU16(y, "rot_angle_y"))
 				{
 					LL_WARNS() << "can't read rot_angle_y in rotation key (" << k << ")" << LL_ENDL;
-					return FALSE;
+					return false;
 				}
 				if (!dp.unpackU16(z, "rot_angle_z"))
 				{
 					LL_WARNS() << "can't read rot_angle_z in rotation key (" << k << ")" << LL_ENDL;
-					return FALSE;
+					return false;
 				}
 
 				LLVector3 rot_vec;
@@ -1615,7 +1615,7 @@ BOOL LLKeyframeMotion::deserialize(LLDataPacker& dp, const LLUUID& asset_id, boo
 				{
 					LL_WARNS() << "non-finite angle in rotation key (" << k << ")"
 						<< " for animation " << asset_id << LL_ENDL;
-					return FALSE;
+					return false;
 				}				
 				rot_key.mRotation.unpackFromVector3(rot_vec);
 			}
@@ -1624,7 +1624,7 @@ BOOL LLKeyframeMotion::deserialize(LLDataPacker& dp, const LLUUID& asset_id, boo
 			{
 				LL_WARNS() << "non-finite angle in rotation key (" << k << ")"
                            << " for animation " << asset_id << LL_ENDL;
-				return FALSE;
+				return false;
 			}
 
 			rCurve->mKeys[time] = rot_key;
@@ -1643,7 +1643,7 @@ BOOL LLKeyframeMotion::deserialize(LLDataPacker& dp, const LLUUID& asset_id, boo
 		{
 			LL_WARNS() << "can't read number of position keys"
                        << " for animation " << asset_id << LL_ENDL;
-			return FALSE;
+			return false;
 		}
 
 		joint_motion->mPositionCurve.mInterpolationType = IT_LINEAR;
@@ -1669,7 +1669,7 @@ BOOL LLKeyframeMotion::deserialize(LLDataPacker& dp, const LLUUID& asset_id, boo
 				{
 					LL_WARNS() << "can't read position key (" << k << ")"
                                << " for animation " << asset_id << LL_ENDL;
-					return FALSE;
+					return false;
 				}
 			}
 			else
@@ -1678,7 +1678,7 @@ BOOL LLKeyframeMotion::deserialize(LLDataPacker& dp, const LLUUID& asset_id, boo
 				{
 					LL_WARNS() << "can't read position key (" << k << ")"
                                << " for animation " << asset_id << LL_ENDL;
-					return FALSE;
+					return false;
 				}
 
 				pos_key.mTime = U16_to_F32(time_short, 0.f, joint_motion_list->mDuration);
@@ -1689,7 +1689,7 @@ BOOL LLKeyframeMotion::deserialize(LLDataPacker& dp, const LLUUID& asset_id, boo
 				if (!dp.unpackVector3(pos_key.mPosition, "pos"))
 				{
 					LL_WARNS() << "can't read pos in position key (" << k << ")" << LL_ENDL;
-					return FALSE;
+					return false;
 				}
                 
                 //MAINT-6162
@@ -1705,17 +1705,17 @@ BOOL LLKeyframeMotion::deserialize(LLDataPacker& dp, const LLUUID& asset_id, boo
 				if (!dp.unpackU16(x, "pos_x"))
 				{
 					LL_WARNS() << "can't read pos_x in position key (" << k << ")" << LL_ENDL;
-					return FALSE;
+					return false;
 				}
 				if (!dp.unpackU16(y, "pos_y"))
 				{
 					LL_WARNS() << "can't read pos_y in position key (" << k << ")" << LL_ENDL;
-					return FALSE;
+					return false;
 				}
 				if (!dp.unpackU16(z, "pos_z"))
 				{
 					LL_WARNS() << "can't read pos_z in position key (" << k << ")" << LL_ENDL;
-					return FALSE;
+					return false;
 				}
 
 				pos_key.mPosition.mV[VX] = U16_to_F32(x, -LL_MAX_PELVIS_OFFSET, LL_MAX_PELVIS_OFFSET);
@@ -1727,7 +1727,7 @@ BOOL LLKeyframeMotion::deserialize(LLDataPacker& dp, const LLUUID& asset_id, boo
 			{
 				LL_WARNS() << "non-finite position in key"
                            << " for animation " << asset_id << LL_ENDL;
-				return FALSE;
+				return false;
 			}
 			
 			pCurve->mKeys[pos_key.mTime] = pos_key;
@@ -1764,7 +1764,7 @@ BOOL LLKeyframeMotion::deserialize(LLDataPacker& dp, const LLUUID& asset_id, boo
 	{
 		LL_WARNS() << "can't read number of constraints"
                    << " for animation " << asset_id << LL_ENDL;
-		return FALSE;
+		return false;
 	}
 
 	if (num_constraints > MAX_CONSTRAINTS || num_constraints < 0)
@@ -1788,7 +1788,7 @@ BOOL LLKeyframeMotion::deserialize(LLDataPacker& dp, const LLUUID& asset_id, boo
 			{
 				LL_WARNS() << "can't read constraint chain length"
                            << " for animation " << asset_id << LL_ENDL;
-				return FALSE;
+				return false;
 			}
 			constraintp->mChainLength = (S32) byte;
 
@@ -1796,21 +1796,21 @@ BOOL LLKeyframeMotion::deserialize(LLDataPacker& dp, const LLUUID& asset_id, boo
 			{
 				LL_WARNS() << "invalid constraint chain length"
                            << " for animation " << asset_id << LL_ENDL;
-				return FALSE;
+				return false;
 			}
 
 			if (!dp.unpackU8(byte, "constraint_type"))
 			{
 				LL_WARNS() << "can't read constraint type"
                            << " for animation " << asset_id << LL_ENDL;
-				return FALSE;
+				return false;
 			}
 			
 			if( byte >= NUM_CONSTRAINT_TYPES )
 			{
 				LL_WARNS() << "invalid constraint type"
                            << " for animation " << asset_id << LL_ENDL;
-				return FALSE;
+				return false;
 			}
 			constraintp->mConstraintType = (EConstraintType)byte;
 
@@ -1820,7 +1820,7 @@ BOOL LLKeyframeMotion::deserialize(LLDataPacker& dp, const LLUUID& asset_id, boo
 			{
 				LL_WARNS() << "can't read source volume name"
                            << " for animation " << asset_id << LL_ENDL;
-				return FALSE;
+				return false;
 			}
 
 			bin_data[BIN_DATA_LENGTH] = 0; // Ensure null termination
@@ -1830,28 +1830,28 @@ BOOL LLKeyframeMotion::deserialize(LLDataPacker& dp, const LLUUID& asset_id, boo
 			{
 				LL_WARNS() << "not a valid source constraint volume " << str
 						   << " for animation " << asset_id << LL_ENDL;
-				return FALSE;
+				return false;
 			}
 
 			if (!dp.unpackVector3(constraintp->mSourceConstraintOffset, "source_offset"))
 			{
 				LL_WARNS() << "can't read constraint source offset"
                            << " for animation " << asset_id << LL_ENDL;
-				return FALSE;
+				return false;
 			}
 			
 			if( !(constraintp->mSourceConstraintOffset.isFinite()) )
 			{
 				LL_WARNS() << "non-finite constraint source offset"
                            << " for animation " << asset_id << LL_ENDL;
-				return FALSE;
+				return false;
 			}
 			
 			if (!dp.unpackBinaryDataFixed(bin_data, BIN_DATA_LENGTH, "target_volume"))
 			{
 				LL_WARNS() << "can't read target volume name"
                            << " for animation " << asset_id << LL_ENDL;
-				return FALSE;
+				return false;
 			}
 
 			bin_data[BIN_DATA_LENGTH] = 0; // Ensure null termination
@@ -1869,7 +1869,7 @@ BOOL LLKeyframeMotion::deserialize(LLDataPacker& dp, const LLUUID& asset_id, boo
 				{
 					LL_WARNS() << "not a valid target constraint volume " << str
 							   << " for animation " << asset_id << LL_ENDL;
-					return FALSE;
+					return false;
 				}
 			}
 
@@ -1877,28 +1877,28 @@ BOOL LLKeyframeMotion::deserialize(LLDataPacker& dp, const LLUUID& asset_id, boo
 			{
 				LL_WARNS() << "can't read constraint target offset"
                            << " for animation " << asset_id << LL_ENDL;
-				return FALSE;
+				return false;
 			}
 
 			if( !(constraintp->mTargetConstraintOffset.isFinite()) )
 			{
 				LL_WARNS() << "non-finite constraint target offset"
                            << " for animation " << asset_id << LL_ENDL;
-				return FALSE;
+				return false;
 			}
 			
 			if (!dp.unpackVector3(constraintp->mTargetConstraintDir, "target_dir"))
 			{
 				LL_WARNS() << "can't read constraint target direction"
                            << " for animation " << asset_id << LL_ENDL;
-				return FALSE;
+				return false;
 			}
 
 			if( !(constraintp->mTargetConstraintDir.isFinite()) )
 			{
 				LL_WARNS() << "non-finite constraint target direction"
                            << " for animation " << asset_id << LL_ENDL;
-				return FALSE;
+				return false;
 			}
 
 			if (!constraintp->mTargetConstraintDir.isExactlyZero())
@@ -1911,35 +1911,35 @@ BOOL LLKeyframeMotion::deserialize(LLDataPacker& dp, const LLUUID& asset_id, boo
 			{
 				LL_WARNS() << "can't read constraint ease in start time"
                            << " for animation " << asset_id << LL_ENDL;
-				return FALSE;
+				return false;
 			}
 
 			if (!dp.unpackF32(constraintp->mEaseInStopTime, "ease_in_stop") || !llfinite(constraintp->mEaseInStopTime))
 			{
 				LL_WARNS() << "can't read constraint ease in stop time"
                            << " for animation " << asset_id << LL_ENDL;
-				return FALSE;
+				return false;
 			}
 
 			if (!dp.unpackF32(constraintp->mEaseOutStartTime, "ease_out_start") || !llfinite(constraintp->mEaseOutStartTime))
 			{
 				LL_WARNS() << "can't read constraint ease out start time"
                            << " for animation " << asset_id << LL_ENDL;
-				return FALSE;
+				return false;
 			}
 
 			if (!dp.unpackF32(constraintp->mEaseOutStopTime, "ease_out_stop") || !llfinite(constraintp->mEaseOutStopTime))
 			{
 				LL_WARNS() << "can't read constraint ease out stop time"
                            << " for animation " << asset_id << LL_ENDL;
-				return FALSE;
+				return false;
 			}
 
 			LLJoint* joint = mCharacter->findCollisionVolume(constraintp->mSourceConstraintVolume);
 			// get joint to which this collision volume is attached
 			if (!joint)
 			{
-				return FALSE;
+				return false;
 			}
 
 			constraintp->mJointStateIndices = new S32[constraintp->mChainLength + 1]; // note: mChainLength is size-limited - comes from a byte
@@ -1952,7 +1952,7 @@ BOOL LLKeyframeMotion::deserialize(LLDataPacker& dp, const LLUUID& asset_id, boo
 					LL_WARNS() << "Joint with no parent: " << joint->getName()
                                << " Emote: " << joint_motion_list->mEmoteName
                                << " for animation " << asset_id << LL_ENDL;
-					return FALSE;
+					return false;
 				}
 				joint = parent;
 				constraintp->mJointStateIndices[i] = -1;
@@ -1964,7 +1964,7 @@ BOOL LLKeyframeMotion::deserialize(LLDataPacker& dp, const LLUUID& asset_id, boo
 					{
 						LL_WARNS() << "Invalid joint " << j
                                    << " for animation " << asset_id << LL_ENDL;
-						return FALSE;
+						return false;
 					}
 					
 					if(constraint_joint == joint)
@@ -1977,7 +1977,7 @@ BOOL LLKeyframeMotion::deserialize(LLDataPacker& dp, const LLUUID& asset_id, boo
 				{
 					LL_WARNS() << "No joint index for constraint " << i
                                << " for animation " << asset_id << LL_ENDL;
-					return FALSE;
+					return false;
 				}
 			}
 
diff --git a/indra/llcharacter/llkeyframemotion.h b/indra/llcharacter/llkeyframemotion.h
index 96746f57c9..59a1d39a62 100644
--- a/indra/llcharacter/llkeyframemotion.h
+++ b/indra/llcharacter/llkeyframemotion.h
@@ -86,9 +86,9 @@ public:
 	//-------------------------------------------------------------------------
 
 	// motions must specify whether or not they loop
-	virtual BOOL getLoop() { 
-		if (mJointMotionList) return mJointMotionList->mLoop; 
-		else return FALSE;
+	virtual bool getLoop() {
+		if (mJointMotionList) return mJointMotionList->mLoop;
+		else return false;
 	}
 
 	// motions must report their total duration
diff --git a/indra/llcharacter/llkeyframemotionparam.h b/indra/llcharacter/llkeyframemotionparam.h
index 1911460972..3b0bc36012 100644
--- a/indra/llcharacter/llkeyframemotionparam.h
+++ b/indra/llcharacter/llkeyframemotionparam.h
@@ -67,7 +67,7 @@ public:
 	//-------------------------------------------------------------------------
 
 	// motions must specify whether or not they loop
-	virtual BOOL getLoop() {
+	virtual bool getLoop() {
 		return true;
 	}
 
diff --git a/indra/llcharacter/llkeyframewalkmotion.h b/indra/llcharacter/llkeyframewalkmotion.h
index cb76995995..d9e9322c82 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 e07f8c5686..a3c23a9c94 100644
--- a/indra/llcharacter/llmotion.cpp
+++ b/indra/llcharacter/llmotion.cpp
@@ -169,7 +169,7 @@ void LLMotion::deactivate()
 	onDeactivate();
 }
 
-BOOL LLMotion::canDeprecate()
+bool LLMotion::canDeprecate()
 {
 	return true;
 }
diff --git a/indra/llcharacter/llmotion.h b/indra/llcharacter/llmotion.h
index 62c381aeb7..1453979764 100644
--- a/indra/llcharacter/llmotion.h
+++ b/indra/llcharacter/llmotion.h
@@ -115,7 +115,7 @@ public:
 	//-------------------------------------------------------------------------
 
 	// motions must specify whether or not they loop
-	virtual BOOL getLoop() = 0;
+	virtual bool getLoop() = 0;
 
 	// motions must report their total duration
 	virtual F32 getDuration() = 0;
@@ -154,7 +154,7 @@ public:
 	// can we crossfade this motion with a new instance when restarted?
 	// should ultimately always be TRUE, but lack of emote blending, etc
 	// requires this
-	virtual BOOL canDeprecate();
+	virtual bool canDeprecate();
 
 	// optional callback routine called when animation deactivated.
 	void	setDeactivateCallback( void (*cb)(void *), void* userdata );
@@ -199,7 +199,7 @@ public:
 	LLTestMotion(const LLUUID &id) : LLMotion(id){}
 	~LLTestMotion() {}
 	static LLMotion *create(const LLUUID& id) { return new LLTestMotion(id); }
-	BOOL getLoop() { return FALSE; }
+	bool getLoop() { return false; }
 	F32 getDuration() { return 0.0f; }
 	F32 getEaseInDuration() { return 0.0f; }
 	F32 getEaseOutDuration() { return 0.0f; }
@@ -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; }
diff --git a/indra/llcharacter/llstatemachine.cpp b/indra/llcharacter/llstatemachine.cpp
index 30f37ce0c2..8261670728 100644
--- a/indra/llcharacter/llstatemachine.cpp
+++ b/indra/llcharacter/llstatemachine.cpp
@@ -89,7 +89,7 @@ BOOL LLStateDiagram::addTransition(LLFSMState& start_state, LLFSMState& end_stat
 	if (transition_it != state_transitions->end())
 	{
 		LL_ERRS() << "LLStateTable::addDirectedTransition() : transition already exists" << LL_ENDL;
-		return FALSE; // transition already exists
+		return false; // transition already exists
 	}
 
 	(*state_transitions)[&transition] = &end_state;
@@ -185,7 +185,7 @@ BOOL LLStateDiagram::stateIsValid(LLFSMState& state)
 	{
 		return true;
 	}
-	return FALSE;
+	return false;
 }
 
 LLFSMState* LLStateDiagram::getState(U32 state_id)
@@ -209,7 +209,7 @@ BOOL LLStateDiagram::saveDotFile(const std::string& filename)
 	if (!dot_file)
 	{
 		LL_WARNS() << "LLStateDiagram::saveDotFile() : Couldn't open " << filename << " to save state diagram." << LL_ENDL;
-		return FALSE;
+		return false;
 	}
 	apr_file_printf(dot_file, "digraph StateMachine {\n\tsize=\"100,100\";\n\tfontsize=40;\n\tlabel=\"Finite State Machine\";\n\torientation=landscape\n\tratio=.77\n");
 	
@@ -322,7 +322,7 @@ BOOL LLStateMachine::setCurrentState(LLFSMState *initial_state, void* user_data,
 		return true;
 	}
 
-	return FALSE;
+	return false;
 }
 
 BOOL LLStateMachine::setCurrentState(U32 state_id, void* user_data, BOOL skip_entry)
@@ -341,7 +341,7 @@ BOOL LLStateMachine::setCurrentState(U32 state_id, void* user_data, BOOL skip_en
 		return true;
 	}
 
-	return FALSE;
+	return false;
 }
 
 void LLStateMachine::processTransition(LLFSMTransition& transition, void* user_data)
diff --git a/indra/llcharacter/lltargetingmotion.h b/indra/llcharacter/lltargetingmotion.h
index b9b838c197..85749a0882 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 9976de9f6f..e19ef19e33 100644
--- a/indra/llcharacter/llvisualparam.cpp
+++ b/indra/llcharacter/llvisualparam.cpp
@@ -48,7 +48,7 @@ LLVisualParamInfo::LLVisualParamInfo()
 //-----------------------------------------------------------------------------
 // parseXml()
 //-----------------------------------------------------------------------------
-BOOL LLVisualParamInfo::parseXml(LLXmlTreeNode *node)
+bool LLVisualParamInfo::parseXml(LLXmlTreeNode *node)
 {
 	// attribute: id
 	static LLStdStringHandle id_string = LLXmlTree::addAttributeString("id");
@@ -102,7 +102,7 @@ BOOL LLVisualParamInfo::parseXml(LLXmlTreeNode *node)
 	else
 	{
 		LL_WARNS() << "Avatar file: <param> has invalid sex attribute: " << sex << LL_ENDL;
-		return FALSE;
+		return false;
 	}
 	
 	// attribute: name
@@ -110,7 +110,7 @@ BOOL LLVisualParamInfo::parseXml(LLXmlTreeNode *node)
 	if( !node->getFastAttributeString( name_string, mName ) )
 	{
 		LL_WARNS() << "Avatar file: <param> is missing name attribute" << LL_ENDL;
-		return FALSE;
+		return false;
 	}
 
 	// attribute: label
@@ -211,7 +211,7 @@ BOOL LLVisualParam::setInfo(LLVisualParamInfo *info)
 {
 	llassert(mInfo == NULL);
 	if (info->mID < 0)
-		return FALSE;
+		return false;
 	mInfo = info;
 	mID = info->mID;
 	setWeight(getDefaultWeight(), FALSE );
@@ -227,7 +227,7 @@ BOOL LLVisualParam::parseData(LLXmlTreeNode *node)
 
 	info->parseXml(node);
 	if (!setInfo(info))
-		return FALSE;
+		return false;
 	
 	return true;
 }
diff --git a/indra/llcharacter/llvisualparam.h b/indra/llcharacter/llvisualparam.h
index 0ad063fd1e..4463cb0ccb 100644
--- a/indra/llcharacter/llvisualparam.h
+++ b/indra/llcharacter/llvisualparam.h
@@ -74,7 +74,7 @@ public:
 	LLVisualParamInfo();
 	virtual ~LLVisualParamInfo() {};
 
-	virtual BOOL parseXml(LLXmlTreeNode *node);
+	virtual bool parseXml(LLXmlTreeNode *node);
 
 	S32 getID() const { return mID; }
 
diff --git a/indra/llcommon/is_approx_equal_fraction.h b/indra/llcommon/is_approx_equal_fraction.h
index e86d58b70f..732d168986 100644
--- a/indra/llcommon/is_approx_equal_fraction.h
+++ b/indra/llcommon/is_approx_equal_fraction.h
@@ -43,9 +43,9 @@
  * signatures.
  */
 template <typename FTYPE>
-inline BOOL is_approx_equal_fraction_impl(FTYPE x, FTYPE y, U32 frac_bits)
+inline bool is_approx_equal_fraction_impl(FTYPE x, FTYPE y, U32 frac_bits)
 {
-    BOOL ret = true;
+    bool ret = true;
     FTYPE diff = (FTYPE) fabs(x - y);
 
     S32 diffInt = (S32) diff;
@@ -65,13 +65,13 @@ inline BOOL is_approx_equal_fraction_impl(FTYPE x, FTYPE y, U32 frac_bits)
 }
 
 /// F32 flavor
-inline BOOL is_approx_equal_fraction(F32 x, F32 y, U32 frac_bits)
+inline bool is_approx_equal_fraction(F32 x, F32 y, U32 frac_bits)
 {
     return is_approx_equal_fraction_impl<F32>(x, y, frac_bits);
 }
 
 /// F64 flavor
-inline BOOL is_approx_equal_fraction(F64 x, F64 y, U32 frac_bits)
+inline bool is_approx_equal_fraction(F64 x, F64 y, U32 frac_bits)
 {
     return is_approx_equal_fraction_impl<F64>(x, y, frac_bits);
 }
diff --git a/indra/llcommon/llcallbacklist.cpp b/indra/llcommon/llcallbacklist.cpp
index 3b63d8f95a..a2800d42ce 100644
--- a/indra/llcommon/llcallbacklist.cpp
+++ b/indra/llcommon/llcallbacklist.cpp
@@ -191,7 +191,7 @@ public:
 	}
 
 private:
-	BOOL tick()
+	bool tick()
 	{
 		mCallable();
 		return true;
@@ -215,7 +215,7 @@ public:
 	{
 	}
 private:
-	BOOL tick()
+	bool tick()
 	{
 		return mCallable();
 	}
diff --git a/indra/llcommon/lleventtimer.h b/indra/llcommon/lleventtimer.h
index dbbfe0c6e6..9bd34915a5 100644
--- a/indra/llcommon/lleventtimer.h
+++ b/indra/llcommon/lleventtimer.h
@@ -43,7 +43,7 @@ public:
 
 	//function to be called at the supplied frequency
 	// Normally return FALSE; TRUE will delete the timer after the function returns.
-	virtual BOOL tick() = 0;
+	virtual bool tick() = 0;
 
 	static void updateClass();
 
@@ -86,7 +86,7 @@ public:
         mOnce(once),
         mCallable(callable)
     {}
-    BOOL tick() override
+    bool tick() override
     {
         mCallable();
         // true tells updateClass() to delete this instance
diff --git a/indra/llcommon/lllivefile.cpp b/indra/llcommon/lllivefile.cpp
index ea485c2d86..852ddb45e9 100644
--- a/indra/llcommon/lllivefile.cpp
+++ b/indra/llcommon/lllivefile.cpp
@@ -170,10 +170,10 @@ namespace
 			: LLEventTimer(refresh), mLiveFile(f)
 			{ }
 			
-		BOOL tick()
-		{ 
+		bool tick()
+		{
 			mLiveFile.checkAndReload(); 
-			return FALSE;
+			return false;
 		}
 	
 	private:
diff --git a/indra/llcommon/llmainthreadtask.h b/indra/llcommon/llmainthreadtask.h
index 878f57cab6..5fae0212c4 100644
--- a/indra/llcommon/llmainthreadtask.h
+++ b/indra/llcommon/llmainthreadtask.h
@@ -79,7 +79,7 @@ private:
             LLEventTimer(0),
             mTask(std::forward<CALLABLE>(callable))
         {}
-        BOOL tick() override
+        bool tick() override
         {
             // run the task on the main thread, will populate the future
             // obtained by get_future()
diff --git a/indra/llui/llflashtimer.cpp b/indra/llui/llflashtimer.cpp
index 39793316f4..d8418f1182 100644
--- a/indra/llui/llflashtimer.cpp
+++ b/indra/llui/llflashtimer.cpp
@@ -53,7 +53,7 @@ void LLFlashTimer::unset()
 	mCallback = NULL;
 }
 
-BOOL LLFlashTimer::tick()
+bool LLFlashTimer::tick()
 {
 	mIsCurrentlyHighlighted = !mIsCurrentlyHighlighted;
 
diff --git a/indra/llui/llflashtimer.h b/indra/llui/llflashtimer.h
index db8d49f009..50c51c0d2a 100644
--- a/indra/llui/llflashtimer.h
+++ b/indra/llui/llflashtimer.h
@@ -46,7 +46,7 @@ public:
 	LLFlashTimer(callback_t cb = NULL, S32 count = 0, F32 period = 0.0);
 	~LLFlashTimer() {};
 
-	/*virtual*/ BOOL tick();
+	/*virtual*/ bool tick();
 
 	void startFlashing();
 	void stopFlashing();
diff --git a/indra/newview/llappearancemgr.cpp b/indra/newview/llappearancemgr.cpp
index 6545b1d278..48af00d063 100644
--- a/indra/newview/llappearancemgr.cpp
+++ b/indra/newview/llappearancemgr.cpp
@@ -125,13 +125,13 @@ public:
 	}
 
 	/*virtual*/
-	BOOL tick()
+	bool tick()
 	{
 		if(mEventTimer.hasExpired())
 		{
 			LLAppearanceMgr::instance().setOutfitLocked(false);
 		}
-		return FALSE;
+		return false;
 	}
 	void stop() { mEventTimer.stop(); }
 	void start() { mEventTimer.start(); }
@@ -333,7 +333,7 @@ public:
 	
 	// virtual
 	// Will be deleted after returning true - only safe to do this if all callbacks have fired.
-	BOOL tick()
+	bool tick()
 	{
 		// mPendingRequests will be zero if all requests have been
 		// responded to.  mWaitTimes.empty() will be true if we have
diff --git a/indra/newview/llbreastmotion.h b/indra/newview/llbreastmotion.h
index aa0fdf9f8b..433fece29f 100644
--- a/indra/newview/llbreastmotion.h
+++ b/indra/newview/llbreastmotion.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/newview/llcallbacklist.cpp b/indra/newview/llcallbacklist.cpp
index 59ecbdd0ea..0096e2532c 100644
--- a/indra/newview/llcallbacklist.cpp
+++ b/indra/newview/llcallbacklist.cpp
@@ -191,10 +191,10 @@ public:
 	}
 
 private:
-	BOOL tick()
+	bool tick()
 	{
 		mCallable();
-		return TRUE;
+		return true;
 	}
 
 	nullary_func_t mCallable;
@@ -215,7 +215,7 @@ public:
 	{
 	}
 private:
-	BOOL tick()
+	bool tick()
 	{
 		return mCallable();
 	}
diff --git a/indra/newview/lldonotdisturbnotificationstorage.cpp b/indra/newview/lldonotdisturbnotificationstorage.cpp
index 4d9ef99319..93a0ef0e82 100644
--- a/indra/newview/lldonotdisturbnotificationstorage.cpp
+++ b/indra/newview/lldonotdisturbnotificationstorage.cpp
@@ -55,7 +55,7 @@ LLDoNotDisturbNotificationStorageTimer::~LLDoNotDisturbNotificationStorageTimer(
 
 }
 
-BOOL LLDoNotDisturbNotificationStorageTimer::tick()
+bool LLDoNotDisturbNotificationStorageTimer::tick()
 {
     LLDoNotDisturbNotificationStorage * doNotDisturbNotificationStorage =  LLDoNotDisturbNotificationStorage::getInstance();
 
@@ -64,7 +64,7 @@ BOOL LLDoNotDisturbNotificationStorageTimer::tick()
     {
         doNotDisturbNotificationStorage->saveNotifications();
     }
-    return FALSE;
+    return false;
 }
 
 LLDoNotDisturbNotificationStorage::LLDoNotDisturbNotificationStorage()
diff --git a/indra/newview/lldonotdisturbnotificationstorage.h b/indra/newview/lldonotdisturbnotificationstorage.h
index 237d58b4de..6e1bf6076c 100644
--- a/indra/newview/lldonotdisturbnotificationstorage.h
+++ b/indra/newview/lldonotdisturbnotificationstorage.h
@@ -42,7 +42,7 @@ public:
     ~LLDoNotDisturbNotificationStorageTimer();
 
 public:
-    BOOL tick();
+    bool tick();
 };
 
 class LLDoNotDisturbNotificationStorage : public LLParamSingleton<LLDoNotDisturbNotificationStorage>, public LLNotificationStorage
diff --git a/indra/newview/llemote.h b/indra/newview/llemote.h
index 4c516998dc..9ea6be6b1e 100644
--- a/indra/newview/llemote.h
+++ b/indra/newview/llemote.h
@@ -69,7 +69,7 @@ public:
 	//-------------------------------------------------------------------------
 
 	// motions must specify whether or not they loop
-	virtual BOOL getLoop() { return FALSE; }
+	virtual bool getLoop() { return false; }
 
 	// motions must report their total duration
 	virtual F32 getDuration() { return EMOTE_MORPH_FADEIN_TIME + EMOTE_MORPH_IN_TIME + EMOTE_MORPH_FADEOUT_TIME; }
@@ -106,7 +106,7 @@ public:
 	// called when a motion is deactivated
 	virtual void onDeactivate();
 
-	virtual BOOL canDeprecate() { return FALSE; }
+	virtual bool canDeprecate() { return false; }
 
 protected:
 
diff --git a/indra/newview/llfloaterlinkreplace.cpp b/indra/newview/llfloaterlinkreplace.cpp
index b42c49c607..459fff0812 100644
--- a/indra/newview/llfloaterlinkreplace.cpp
+++ b/indra/newview/llfloaterlinkreplace.cpp
@@ -310,7 +310,7 @@ void LLFloaterLinkReplace::decreaseOpenItemCount()
 	}
 }
 
-BOOL LLFloaterLinkReplace::tick()
+bool LLFloaterLinkReplace::tick()
 {
 	LL_DEBUGS() << "Calling tick - remaining items = " << mRemainingInventoryItems.size() << LL_ENDL;
 
@@ -329,7 +329,7 @@ BOOL LLFloaterLinkReplace::tick()
 	}
 	processBatch(current_batch);
 
-	return FALSE;
+	return false;
 }
 
 void LLFloaterLinkReplace::processBatch(LLInventoryModel::item_array_t items)
diff --git a/indra/newview/llfloaterlinkreplace.h b/indra/newview/llfloaterlinkreplace.h
index 060773f93e..ab2ff87042 100644
--- a/indra/newview/llfloaterlinkreplace.h
+++ b/indra/newview/llfloaterlinkreplace.h
@@ -89,7 +89,7 @@ public:
 	BOOL postBuild();
 	virtual void onOpen(const LLSD& key);
 
-	virtual BOOL tick();
+	virtual bool tick();
 
 private:
 	void checkEnableStart();
diff --git a/indra/newview/llfloaterpreference.cpp b/indra/newview/llfloaterpreference.cpp
index d15c52cc24..ab9714b89f 100644
--- a/indra/newview/llfloaterpreference.cpp
+++ b/indra/newview/llfloaterpreference.cpp
@@ -1980,12 +1980,12 @@ public:
 
 protected:
 
-	BOOL tick()
+	bool tick()
 	{
 		mCallback(mNewValue);
 		mEventTimer.stop();
 
-		return FALSE;
+		return false;
 	}
 
 private:
diff --git a/indra/newview/llfloaterregionrestarting.cpp b/indra/newview/llfloaterregionrestarting.cpp
index 95d4265bb4..6817cce5f6 100644
--- a/indra/newview/llfloaterregionrestarting.cpp
+++ b/indra/newview/llfloaterregionrestarting.cpp
@@ -74,11 +74,11 @@ void LLFloaterRegionRestarting::regionChange()
 	close();
 }
 
-BOOL LLFloaterRegionRestarting::tick()
+bool LLFloaterRegionRestarting::tick()
 {
 	refresh();
 
-	return FALSE;
+	return false;
 }
 
 void LLFloaterRegionRestarting::refresh()
diff --git a/indra/newview/llfloaterregionrestarting.h b/indra/newview/llfloaterregionrestarting.h
index 46416db2c8..5b46f72b09 100644
--- a/indra/newview/llfloaterregionrestarting.h
+++ b/indra/newview/llfloaterregionrestarting.h
@@ -43,7 +43,7 @@ private:
 	LLFloaterRegionRestarting(const LLSD& key);
 	virtual ~LLFloaterRegionRestarting();
 	virtual BOOL postBuild();
-	virtual BOOL tick();
+	virtual bool tick();
 	virtual void refresh();
 	virtual void draw();
 	virtual void regionChange();
diff --git a/indra/newview/llfloateruipreview.cpp b/indra/newview/llfloateruipreview.cpp
index 67a205417e..83b886237f 100644
--- a/indra/newview/llfloateruipreview.cpp
+++ b/indra/newview/llfloateruipreview.cpp
@@ -254,7 +254,7 @@ class LLFadeEventTimer : public LLEventTimer
 {
 public:
 	LLFadeEventTimer(F32 refresh, LLGUIPreviewLiveFile* parent);
-	BOOL tick();
+	bool tick();
 	LLGUIPreviewLiveFile* mParent;
 private:
 	BOOL mFadingOut;			// fades in then out; this is toggled in between
@@ -355,17 +355,17 @@ LLFadeEventTimer::LLFadeEventTimer(F32 refresh, LLGUIPreviewLiveFile* parent)
 }
 
 // Single tick of fade event timer: increment the color
-BOOL LLFadeEventTimer::tick()
+bool LLFadeEventTimer::tick()
 {
 	float diff = 0.04f;
-	if(TRUE == mFadingOut)	// set fade for in/out color direction
+	if(true == mFadingOut)	// set fade for in/out color direction
 	{
 		diff = -diff;
 	}
 
 	if(NULL == mParent)	// no more need to tick, so suicide
 	{
-		return TRUE;
+		return true;
 	}
 
 	// Set up colors
@@ -385,10 +385,10 @@ BOOL LLFadeEventTimer::tick()
 
 	if(bg_color[2] <= 0.0f)	// end of fade out, start fading in
 	{
-		mFadingOut = FALSE;
+		mFadingOut = false;
 	}
 
-	return FALSE;
+	return false;
 }
 
 // Constructor
diff --git a/indra/newview/llimview.cpp b/indra/newview/llimview.cpp
index 61a01d7418..e3567f4595 100644
--- a/indra/newview/llimview.cpp
+++ b/indra/newview/llimview.cpp
@@ -99,16 +99,16 @@ const LLUUID LLOutgoingCallDialog::OCD_KEY = LLUUID("7CF78E11-0CFE-498D-ADB9-141
 LLIMMgr* gIMMgr = NULL;
 
 
-BOOL LLSessionTimeoutTimer::tick()
+bool LLSessionTimeoutTimer::tick()
 {
-	if (mSessionId.isNull()) return TRUE;
+	if (mSessionId.isNull()) return true;
 
 	LLIMModel::LLIMSession* session = LLIMModel::getInstance()->findIMSession(mSessionId);
 	if (session && !session->mSessionInitialized)
 	{
 		gIMMgr->showSessionStartError("session_initialization_timed_out_error", mSessionId);
 	}
-	return TRUE;
+	return true;
 }
 
 
diff --git a/indra/newview/llimview.h b/indra/newview/llimview.h
index 946eb02f26..b9c7065872 100644
--- a/indra/newview/llimview.h
+++ b/indra/newview/llimview.h
@@ -51,7 +51,7 @@ class LLSessionTimeoutTimer : public LLEventTimer
 public:
 	LLSessionTimeoutTimer(const LLUUID& session_id, F32 period) : LLEventTimer(period), mSessionId(session_id) {}
 	virtual ~LLSessionTimeoutTimer() {};
-	/* virtual */ BOOL tick();
+	/* virtual */ bool tick();
 
 private:
 	LLUUID mSessionId;
diff --git a/indra/newview/lllocalbitmaps.cpp b/indra/newview/lllocalbitmaps.cpp
index 5a5fb7474c..fcf0f1d641 100644
--- a/indra/newview/lllocalbitmaps.cpp
+++ b/indra/newview/lllocalbitmaps.cpp
@@ -1009,10 +1009,10 @@ bool LLLocalBitmapTimer::isRunning()
 	return mEventTimer.getStarted();
 }
 
-BOOL LLLocalBitmapTimer::tick()
+bool LLLocalBitmapTimer::tick()
 {
 	LLLocalBitmapMgr::getInstance()->doUpdates();
-	return FALSE;
+	return false;
 }
 
 /*=======================================*/
diff --git a/indra/newview/lllocalbitmaps.h b/indra/newview/lllocalbitmaps.h
index 1fdf9dccbf..da854d672d 100644
--- a/indra/newview/lllocalbitmaps.h
+++ b/indra/newview/lllocalbitmaps.h
@@ -121,7 +121,7 @@ class LLLocalBitmapTimer : public LLEventTimer
 		void startTimer();
 		void stopTimer();
 		bool isRunning();
-		BOOL tick();
+		bool tick();
 
 };
 
diff --git a/indra/newview/lllocalgltfmaterials.cpp b/indra/newview/lllocalgltfmaterials.cpp
index 61e0163798..cf0742299c 100644
--- a/indra/newview/lllocalgltfmaterials.cpp
+++ b/indra/newview/lllocalgltfmaterials.cpp
@@ -301,11 +301,11 @@ bool LLLocalGLTFMaterialTimer::isRunning()
     return mEventTimer.getStarted();
 }
 
-BOOL LLLocalGLTFMaterialTimer::tick()
+bool LLLocalGLTFMaterialTimer::tick()
 {
     // todo: do on idle? No point in timer 
     LLLocalGLTFMaterialMgr::getInstance()->doUpdates();
-    return FALSE;
+    return false;
 }
 
 /*=======================================*/
diff --git a/indra/newview/lllocalgltfmaterials.h b/indra/newview/lllocalgltfmaterials.h
index 13b7577e96..46776430ff 100644
--- a/indra/newview/lllocalgltfmaterials.h
+++ b/indra/newview/lllocalgltfmaterials.h
@@ -90,7 +90,7 @@ public:
     void startTimer();
     void stopTimer();
     bool isRunning();
-    BOOL tick();
+    bool tick();
 };
 
 class LLLocalGLTFMaterialMgr : public LLSingleton<LLLocalGLTFMaterialMgr>
diff --git a/indra/newview/llmediadataclient.cpp b/indra/newview/llmediadataclient.cpp
index d3b981e205..d5a2f07e11 100644
--- a/indra/newview/llmediadataclient.cpp
+++ b/indra/newview/llmediadataclient.cpp
@@ -418,9 +418,9 @@ LLMediaDataClient::QueueTimer::QueueTimer(F32 time, LLMediaDataClient *mdc)
 }
 
 // virtual
-BOOL LLMediaDataClient::QueueTimer::tick()
+bool LLMediaDataClient::QueueTimer::tick()
 {
-	BOOL result = TRUE;
+	BOOL result = true;
 	
 	if (!mMDC.isNull())
 	{
@@ -451,7 +451,7 @@ LLMediaDataClient::RetryTimer::RetryTimer(F32 time, Request::ptr_t request)
 }
 
 // virtual
-BOOL LLMediaDataClient::RetryTimer::tick()
+bool LLMediaDataClient::RetryTimer::tick()
 {
 	mRequest->stopTracking();
 
@@ -469,7 +469,7 @@ BOOL LLMediaDataClient::RetryTimer::tick()
     mRequest.reset();
 
 	// Don't fire again
-	return TRUE;
+	return true;
 }
 
 
diff --git a/indra/newview/llmediadataclient.h b/indra/newview/llmediadataclient.h
index 58f8bad3e4..cd45825c77 100644
--- a/indra/newview/llmediadataclient.h
+++ b/indra/newview/llmediadataclient.h
@@ -219,7 +219,7 @@ protected:
 	{
 	public:
 		RetryTimer(F32 time, Request::ptr_t);
-		virtual BOOL tick();
+		virtual bool tick();
 	private:
 		// back-pointer
 		Request::ptr_t mRequest;
@@ -286,7 +286,7 @@ private:
 	{
 	public:
 		QueueTimer(F32 time, LLMediaDataClient *mdc);
-		virtual BOOL tick();
+		virtual bool tick();
 	private:
 		// back-pointer
 		LLPointer<LLMediaDataClient> mMDC;
diff --git a/indra/newview/llpanelpeople.cpp b/indra/newview/llpanelpeople.cpp
index b3224c2c1f..31fe6bc49b 100644
--- a/indra/newview/llpanelpeople.cpp
+++ b/indra/newview/llpanelpeople.cpp
@@ -313,9 +313,9 @@ public:
 		mEventTimer.stop();
 	}
 
-	virtual BOOL tick() // from LLEventTimer
+	virtual bool tick() // from LLEventTimer
 	{
-		return FALSE;
+		return false;
 	}
 };
 
@@ -367,9 +367,9 @@ public:
 	}
 
 
-	/*virtual*/ BOOL tick()
+	/*virtual*/ bool tick()
 	{
-		if (!mIsActive) return FALSE;
+		if (!mIsActive) return false;
 
 		if (mMask & (LLFriendObserver::ADD | LLFriendObserver::REMOVE | LLFriendObserver::ONLINE))
 		{
@@ -380,7 +380,7 @@ public:
 		mEventTimer.stop();
 		mMask = 0;
 
-		return FALSE;
+		return false;
 	}
 
 	// virtual
@@ -508,10 +508,10 @@ public:
 		}
 	}
 
-	/*virtual*/ BOOL tick()
+	/*virtual*/ bool tick()
 	{
 		update();
-		return FALSE;
+		return false;
 	}
 private:
 };
diff --git a/indra/newview/llphysicsmotion.h b/indra/newview/llphysicsmotion.h
index b246fa99bb..a3b8e293f1 100644
--- a/indra/newview/llphysicsmotion.h
+++ b/indra/newview/llphysicsmotion.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/newview/llsetkeybinddialog.cpp b/indra/newview/llsetkeybinddialog.cpp
index 74844a80e8..c5a8380eff 100644
--- a/indra/newview/llsetkeybinddialog.cpp
+++ b/indra/newview/llsetkeybinddialog.cpp
@@ -53,11 +53,11 @@ public:
     virtual ~Updater(){}
 
 protected:
-    BOOL tick()
+    bool tick()
     {
         mCallback(mMask);
         // Deletes itseft after execution
-        return TRUE;
+        return true;
     }
 
 private:
diff --git a/indra/newview/llspeakers.cpp b/indra/newview/llspeakers.cpp
index 60bada8f58..2bc8d04a8e 100644
--- a/indra/newview/llspeakers.cpp
+++ b/indra/newview/llspeakers.cpp
@@ -181,13 +181,13 @@ LLSpeakerActionTimer::LLSpeakerActionTimer(action_callback_t action_cb, F32 acti
 {
 }
 
-BOOL LLSpeakerActionTimer::tick()
+bool LLSpeakerActionTimer::tick()
 {
 	if (mActionCallback)
 	{
 		return (BOOL)mActionCallback(mSpeakerId);
 	}
-	return TRUE;
+	return true;
 }
 
 void LLSpeakerActionTimer::unset()
diff --git a/indra/newview/llspeakers.h b/indra/newview/llspeakers.h
index ed795b5155..f1c0de2a9b 100644
--- a/indra/newview/llspeakers.h
+++ b/indra/newview/llspeakers.h
@@ -159,7 +159,7 @@ public:
 	 *
 	 * If action callback is not specified returns true. Instance will be deleted by LLEventTimer::updateClass().
 	 */
-	virtual BOOL tick();
+	virtual bool tick();
 
 	/**
 	 * Clears the callback.
diff --git a/indra/newview/lltoast.cpp b/indra/newview/lltoast.cpp
index 223aaad811..0d71287fc5 100644
--- a/indra/newview/lltoast.cpp
+++ b/indra/newview/lltoast.cpp
@@ -44,13 +44,13 @@ LLToastLifeTimer::LLToastLifeTimer(LLToast* toast, F32 period)
 }
 
 /*virtual*/
-BOOL LLToastLifeTimer::tick()
+bool LLToastLifeTimer::tick()
 {
 	if (mEventTimer.hasExpired())
 	{
 		mToast->expire();
 	}
-	return FALSE;
+	return false;
 }
 
 void LLToastLifeTimer::stop()
diff --git a/indra/newview/lltoast.h b/indra/newview/lltoast.h
index ab559f1e6f..412656937b 100644
--- a/indra/newview/lltoast.h
+++ b/indra/newview/lltoast.h
@@ -53,7 +53,7 @@ public:
 	LLToastLifeTimer(LLToast* toast, F32 period);
 
 	/*virtual*/
-	BOOL tick();
+	bool tick();
 	void stop();
 	void start();
 	void restart();
diff --git a/indra/newview/llviewerjointattachment.cpp b/indra/newview/llviewerjointattachment.cpp
index b3bfb86b99..55fa2682e1 100644
--- a/indra/newview/llviewerjointattachment.cpp
+++ b/indra/newview/llviewerjointattachment.cpp
@@ -424,7 +424,7 @@ void LLViewerJointAttachment::calcLOD()
 //-----------------------------------------------------------------------------
 // updateLOD()
 //-----------------------------------------------------------------------------
-BOOL LLViewerJointAttachment::updateLOD(F32 pixel_area, BOOL activate)
+bool LLViewerJointAttachment::updateLOD(F32 pixel_area, bool activate)
 {
 	BOOL res = FALSE;
 	if (!mValid)
diff --git a/indra/newview/llviewerjointattachment.h b/indra/newview/llviewerjointattachment.h
index e5edf2c06b..4f72f3dfa9 100644
--- a/indra/newview/llviewerjointattachment.h
+++ b/indra/newview/llviewerjointattachment.h
@@ -57,7 +57,7 @@ public:
 	// Called by render().
 	/*virtual*/ U32 drawShape( F32 pixelArea, BOOL first_pass, BOOL is_dummy );
 	
-	/*virtual*/ BOOL updateLOD(F32 pixel_area, BOOL activate);
+	/*virtual*/ bool updateLOD(F32 pixel_area, bool activate);
 
 	//
 	// accessors
diff --git a/indra/newview/llviewerjointmesh.cpp b/indra/newview/llviewerjointmesh.cpp
index 5d46c695b7..7f774e9f63 100644
--- a/indra/newview/llviewerjointmesh.cpp
+++ b/indra/newview/llviewerjointmesh.cpp
@@ -436,9 +436,9 @@ void LLViewerJointMesh::updateFaceData(LLFace *face, F32 pixel_area, BOOL damp_w
 //-----------------------------------------------------------------------------
 // updateLOD()
 //-----------------------------------------------------------------------------
-BOOL LLViewerJointMesh::updateLOD(F32 pixel_area, BOOL activate)
+bool LLViewerJointMesh::updateLOD(F32 pixel_area, bool activate)
 {
-	BOOL valid = mValid;
+	bool valid = mValid;
 	setValid(activate, TRUE);
 	return (valid != activate);
 }
diff --git a/indra/newview/llviewerjointmesh.h b/indra/newview/llviewerjointmesh.h
index 0db2836e15..1fe58c60ad 100644
--- a/indra/newview/llviewerjointmesh.h
+++ b/indra/newview/llviewerjointmesh.h
@@ -62,7 +62,7 @@ public:
 
 	/*virtual*/ void updateFaceSizes(U32 &num_vertices, U32& num_indices, F32 pixel_area);
 	/*virtual*/ void updateFaceData(LLFace *face, F32 pixel_area, BOOL damp_wind = FALSE, bool terse_update = false);
-	/*virtual*/ BOOL updateLOD(F32 pixel_area, BOOL activate);
+	/*virtual*/ bool updateLOD(F32 pixel_area, bool activate);
 	/*virtual*/ void updateJointGeometry();
 	/*virtual*/ void dump();
 
diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp
index 721f822f63..8c76f575a9 100644
--- a/indra/newview/llviewermessage.cpp
+++ b/indra/newview/llviewermessage.cpp
@@ -2885,7 +2885,7 @@ public:
 	virtual ~LLPostTeleportNotifiers();
 
 	//function to be called at the supplied frequency
-	virtual BOOL tick();
+	virtual bool tick();
 };
 
 LLPostTeleportNotifiers::LLPostTeleportNotifiers() : LLEventTimer( 2.0 )
@@ -2896,9 +2896,9 @@ LLPostTeleportNotifiers::~LLPostTeleportNotifiers()
 {
 }
 
-BOOL LLPostTeleportNotifiers::tick()
+bool LLPostTeleportNotifiers::tick()
 {
-	BOOL all_done = FALSE;
+	bool all_done = false;
 	if ( gAgent.getTeleportState() == LLAgent::TELEPORT_NONE )
 	{
 		// get callingcards and landmarks available to the user arriving.
@@ -2922,7 +2922,7 @@ BOOL LLPostTeleportNotifiers::tick()
 				gInventory.addObserver(fetcher);
 			}
 		}
-		all_done = TRUE;
+		all_done = true;
 	}
 
 	return all_done;
diff --git a/indra/newview/llviewerobject.cpp b/indra/newview/llviewerobject.cpp
index c4e5fcc7b6..a0a9da5bec 100644
--- a/indra/newview/llviewerobject.cpp
+++ b/indra/newview/llviewerobject.cpp
@@ -3656,14 +3656,14 @@ void LLViewerObject::setPixelAreaAndAngle(LLAgent &agent)
 	}
 }
 
-BOOL LLViewerObject::updateLOD()
+bool LLViewerObject::updateLOD()
 {
-	return FALSE;
+	return false;
 }
 
 BOOL LLViewerObject::updateGeometry(LLDrawable *drawable)
 {
-	return TRUE;
+	return false;
 }
 
 void LLViewerObject::updateGL()
diff --git a/indra/newview/llviewerobject.h b/indra/newview/llviewerobject.h
index b85dcc5da2..81413f3976 100644
--- a/indra/newview/llviewerobject.h
+++ b/indra/newview/llviewerobject.h
@@ -221,7 +221,7 @@ public:
 	virtual BOOL		updateGeometry(LLDrawable *drawable);
 	virtual void		updateGL();
 	virtual void		updateFaceSize(S32 idx);
-	virtual BOOL		updateLOD();
+	virtual bool		updateLOD();
 	virtual BOOL		setDrawableParent(LLDrawable* parentp);
 	F32					getRotTime() { return mRotTime; }
 private:
diff --git a/indra/newview/llviewerparcelmediaautoplay.cpp b/indra/newview/llviewerparcelmediaautoplay.cpp
index db8fcb4dc4..6db54d812f 100644
--- a/indra/newview/llviewerparcelmediaautoplay.cpp
+++ b/indra/newview/llviewerparcelmediaautoplay.cpp
@@ -60,7 +60,7 @@ void LLViewerParcelMediaAutoPlay::playStarted()
     LLSingleton<LLViewerParcelMediaAutoPlay>::getInstance()->mPlayed = TRUE;
 }
 
-BOOL LLViewerParcelMediaAutoPlay::tick()
+bool LLViewerParcelMediaAutoPlay::tick()
 {
 	LLParcel *this_parcel = NULL;
 	LLViewerRegion *this_region = NULL;
@@ -94,7 +94,7 @@ BOOL LLViewerParcelMediaAutoPlay::tick()
 	    this_region_id != mLastRegionID)
 	{
 		// we've entered a new parcel
-		mPlayed    = FALSE;                   // we haven't autoplayed yet
+		mPlayed    = false;                   // we haven't autoplayed yet
 		mTimeInParcel = 0;                    // reset our timer
 		mLastParcelID = this_parcel_id;
 		mLastRegionID = this_region_id;
@@ -156,7 +156,7 @@ BOOL LLViewerParcelMediaAutoPlay::tick()
 	}
 
 
-	return FALSE; // continue ticking forever please.
+	return false; // continue ticking forever please.
 }
 
 //static
diff --git a/indra/newview/llviewerparcelmediaautoplay.h b/indra/newview/llviewerparcelmediaautoplay.h
index d71fd4c075..952747a2af 100644
--- a/indra/newview/llviewerparcelmediaautoplay.h
+++ b/indra/newview/llviewerparcelmediaautoplay.h
@@ -35,7 +35,7 @@ class LLViewerParcelMediaAutoPlay : LLEventTimer, public LLSingleton<LLViewerPar
 {
 	LLSINGLETON(LLViewerParcelMediaAutoPlay);
 public:
-	virtual BOOL tick();
+	virtual bool tick();
 	static void playStarted();
 
  private:
diff --git a/indra/newview/llvoavatar.cpp b/indra/newview/llvoavatar.cpp
index 3332a2ef53..bb4ffac604 100644
--- a/indra/newview/llvoavatar.cpp
+++ b/indra/newview/llvoavatar.cpp
@@ -292,7 +292,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; }
@@ -400,7 +400,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; }
@@ -513,7 +513,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; }
@@ -10427,7 +10427,7 @@ LLHost LLVOAvatar::getObjectHost() const
 	}
 }
 
-BOOL LLVOAvatar::updateLOD()
+bool LLVOAvatar::updateLOD()
 {
     if (mDrawable.isNull())
     {
diff --git a/indra/newview/llvoavatar.h b/indra/newview/llvoavatar.h
index 81831c3829..72770e19a8 100644
--- a/indra/newview/llvoavatar.h
+++ b/indra/newview/llvoavatar.h
@@ -132,7 +132,7 @@ public:
 													 const EObjectUpdateType update_type,
 													 LLDataPacker *dp);
 	virtual void   	 	 	idleUpdate(LLAgent &agent, const F64 &time);
-	/*virtual*/ BOOL   	 	 	updateLOD();
+	/*virtual*/ bool   	 	 	updateLOD();
 	BOOL  	 	 	 	 	updateJointLODs();
 	void					updateLODRiggedAttachments( void );
 	/*virtual*/ BOOL   	 	 	isActive() const; // Whether this object needs to do an idleUpdate.
diff --git a/indra/newview/llvograss.cpp b/indra/newview/llvograss.cpp
index b814f15232..478db3a6fc 100644
--- a/indra/newview/llvograss.cpp
+++ b/indra/newview/llvograss.cpp
@@ -333,11 +333,11 @@ void LLVOGrass::updateTextures()
 	}
 }
 
-BOOL LLVOGrass::updateLOD()
+bool LLVOGrass::updateLOD()
 {
 	if (mDrawable->getNumFaces() <= 0)
 	{
-		return FALSE;
+		return false;
 	}
 
     LLFace* face = mDrawable->getFace(0);
@@ -350,7 +350,7 @@ BOOL LLVOGrass::updateLOD()
             face->setSize(0, 0);
 			gPipeline.markRebuild(mDrawable, LLDrawable::REBUILD_ALL);
 		}
-		return TRUE ;
+		return true ;
 	}
 	if(!mNumBlades)
 	{
@@ -387,10 +387,10 @@ BOOL LLVOGrass::updateLOD()
 			face->setSize(mNumBlades*8, mNumBlades*12);
 		}
 		gPipeline.markRebuild(mDrawable, LLDrawable::REBUILD_ALL);
-		return TRUE;
+		return true;
 	}
 
-	return FALSE;
+	return false;
 }
 
 LLDrawable* LLVOGrass::createDrawable(LLPipeline *pipeline)
diff --git a/indra/newview/llvograss.h b/indra/newview/llvograss.h
index 63876dc099..09783ede2e 100644
--- a/indra/newview/llvograss.h
+++ b/indra/newview/llvograss.h
@@ -67,7 +67,7 @@ public:
 
 	void updateFaceSize(S32 idx) { }
 	/*virtual*/ void updateTextures();											
-	/*virtual*/ BOOL updateLOD();
+	/*virtual*/ bool updateLOD();
 	/*virtual*/ void setPixelAreaAndAngle(LLAgent &agent); // generate accurate apparent angle and area
 
 	void plantBlades();
diff --git a/indra/newview/llvosurfacepatch.cpp b/indra/newview/llvosurfacepatch.cpp
index 15fabf0414..be0e992e2c 100644
--- a/indra/newview/llvosurfacepatch.cpp
+++ b/indra/newview/llvosurfacepatch.cpp
@@ -236,9 +236,9 @@ void LLVOSurfacePatch::updateFaceSize(S32 idx)
 	}
 }
 
-BOOL LLVOSurfacePatch::updateLOD()
+bool LLVOSurfacePatch::updateLOD()
 {
-	return TRUE;
+	return true;
 }
 
 void LLVOSurfacePatch::getGeometry(LLStrider<LLVector3> &verticesp,
diff --git a/indra/newview/llvosurfacepatch.h b/indra/newview/llvosurfacepatch.h
index aed67162d1..c5f7f103f4 100644
--- a/indra/newview/llvosurfacepatch.h
+++ b/indra/newview/llvosurfacepatch.h
@@ -61,7 +61,7 @@ public:
 	/*virtual*/ LLDrawable* createDrawable(LLPipeline *pipeline);
 	/*virtual*/ void		updateGL();
 	/*virtual*/ BOOL        updateGeometry(LLDrawable *drawable);
-	/*virtual*/ BOOL		updateLOD();
+	/*virtual*/ bool		updateLOD();
 	/*virtual*/ void		updateFaceSize(S32 idx);
 	void getGeometry(LLStrider<LLVector3> &verticesp,
 								LLStrider<LLVector3> &normalsp,
diff --git a/indra/newview/llvovolume.cpp b/indra/newview/llvovolume.cpp
index ad6c39de48..0917a819d0 100644
--- a/indra/newview/llvovolume.cpp
+++ b/indra/newview/llvovolume.cpp
@@ -1549,16 +1549,16 @@ BOOL LLVOVolume::calcLOD()
 	return FALSE;
 }
 
-BOOL LLVOVolume::updateLOD()
+bool LLVOVolume::updateLOD()
 {
 	if (mDrawable.isNull())
 	{
-		return FALSE;
+		return false;
 	}
 
     LL_PROFILE_ZONE_SCOPED_CATEGORY_VOLUME;
 
-	BOOL lod_changed = FALSE;
+	bool lod_changed = false;
 
 	if (!LLSculptIDSize::instance().isUnloaded(getVolume()->getParams().getSculptID())) 
 	{
@@ -1566,13 +1566,13 @@ BOOL LLVOVolume::updateLOD()
 	}
 	else
 	{
-		return FALSE;
+		return false;
 	}
 
 	if (lod_changed)
 	{
 		gPipeline.markRebuild(mDrawable, LLDrawable::REBUILD_VOLUME);
-		mLODChanged = TRUE;
+		mLODChanged = true;
 	}
 	else
 	{
diff --git a/indra/newview/llvovolume.h b/indra/newview/llvovolume.h
index aadc1fbcf3..b65450a3f2 100644
--- a/indra/newview/llvovolume.h
+++ b/indra/newview/llvovolume.h
@@ -238,7 +238,7 @@ public:
 				void	updateRelativeXform(bool force_identity = false);
 	/*virtual*/ BOOL	updateGeometry(LLDrawable *drawable) override;
 	/*virtual*/ void	updateFaceSize(S32 idx) override;
-	/*virtual*/ BOOL	updateLOD() override;
+	/*virtual*/ bool	updateLOD() override;
 				void	updateRadius() override;
 	/*virtual*/ void	updateTextures() override;
 				void	updateTextureVirtualSize(bool forced = false);