misc: BOOL to bool

133 files changed, 1072 insertions, 1075 deletions

diff --git a/indra/llappearance/llavatarappearance.cpp b/indra/llappearance/llavatarappearance.cpp
index 7d9d2ba24c..43ee78519d 100644
--- a/indra/llappearance/llavatarappearance.cpp
+++ b/indra/llappearance/llavatarappearance.cpp
@@ -78,7 +78,7 @@ class LLAvatarBoneInfo
 	friend class LLAvatarAppearance;
 	friend class LLAvatarSkeletonInfo;
 public:
-	LLAvatarBoneInfo() : mIsJoint(FALSE) {}
+	LLAvatarBoneInfo() : mIsJoint(false) {}
 	~LLAvatarBoneInfo()
 	{
 		std::for_each(mChildren.begin(), mChildren.end(), DeletePointer());
@@ -178,7 +178,7 @@ LLAvatarAppearanceDefines::LLAvatarAppearanceDictionary* LLAvatarAppearance::sAv
 
 LLAvatarAppearance::LLAvatarAppearance(LLWearableData* wearable_data) :
 	LLCharacter(),
-	mIsDummy(FALSE),
+	mIsDummy(false),
 	mTexSkinColor( NULL ),
 	mTexHairColor( NULL ),
 	mTexEyeColor( NULL ),
@@ -189,7 +189,7 @@ LLAvatarAppearance::LLAvatarAppearance(LLWearableData* wearable_data) :
     mNumBones(0),
     mNumCollisionVolumes(0),
     mCollisionVolumes(NULL),
-    mIsBuilt(FALSE),
+    mIsBuilt(false),
     mInitFlags(0)
 {
 	llassert_always(mWearableData);
@@ -236,14 +236,14 @@ void LLAvatarAppearance::initInstance()
 			mesh->setName(mesh_name);
 			mesh->setMeshID(mesh_index);
 			mesh->setPickName(mesh_dict->mPickName);
-			mesh->setIsTransparent(FALSE);
+			mesh->setIsTransparent(false);
 			switch((S32)mesh_index)
 			{
 				case MESH_ID_HAIR:
-					mesh->setIsTransparent(TRUE);
+					mesh->setIsTransparent(true);
 					break;
 				case MESH_ID_SKIRT:
-					mesh->setIsTransparent(TRUE);
+					mesh->setIsTransparent(true);
 					break;
 				case MESH_ID_EYEBALL_LEFT:
 				case MESH_ID_EYEBALL_RIGHT:
@@ -345,7 +345,7 @@ void LLAvatarAppearance::initClass(const std::string& avatar_file_name_arg, cons
         avatar_file_name = gDirUtilp->getExpandedFilename(LL_PATH_CHARACTER,AVATAR_DEFAULT_CHAR + "_lad.xml");
     }
 	LLXmlTree xml_tree;
-	bool success = xml_tree.parseFile( avatar_file_name, FALSE );
+	bool success = xml_tree.parseFile( avatar_file_name, false );
 	if (!success)
 	{
 		LL_ERRS() << "Problem reading avatar configuration file:" << avatar_file_name << LL_ENDL;
@@ -580,7 +580,7 @@ bool LLAvatarAppearance::parseSkeletonFile(const std::string& filename, LLXmlTre
 	//-------------------------------------------------------------------------
 	// parse the file
 	//-------------------------------------------------------------------------
-	bool parsesuccess = skeleton_xml_tree.parseFile( filename, FALSE );
+	bool parsesuccess = skeleton_xml_tree.parseFile( filename, false );
 
 	if (!parsesuccess)
 	{
@@ -804,7 +804,7 @@ void LLAvatarAppearance::buildCharacter()
 	//-------------------------------------------------------------------------
 	mRoot->removeAllChildren();
 	mJointMap.clear();
-	mIsBuilt = FALSE;
+	mIsBuilt = false;
 
 	//-------------------------------------------------------------------------
 	// clear mesh data
@@ -825,7 +825,7 @@ void LLAvatarAppearance::buildCharacter()
 	bool status = loadAvatar();
 	stop_glerror();
 
-// 	gPrintMessagesThisFrame = TRUE;
+// 	gPrintMessagesThisFrame = true;
 	LL_DEBUGS() << "Avatar load took " << timer.getElapsedTimeF32() << " seconds." << LL_ENDL;
 
 	if (!status)
@@ -895,7 +895,7 @@ void LLAvatarAppearance::buildCharacter()
 	// SL-315
 	mPelvisp->setPosition( LLVector3(0.0f, 0.0f, 0.0f) );
 
-	mIsBuilt = TRUE;
+	mIsBuilt = true;
 	stop_glerror();
 
 }
@@ -1041,7 +1041,7 @@ bool LLAvatarAppearance::loadSkeletonNode ()
 	// make meshes children before calling parent version of the function
 	for (LLAvatarJoint* joint : mMeshLOD)
 	{
-		joint->mUpdateXform = FALSE;
+		joint->mUpdateXform = false;
 		joint->setMeshesToChildren();
 	}
 
@@ -1104,7 +1104,7 @@ bool LLAvatarAppearance::loadMeshNodes()
 
 		LLAvatarJointMesh* mesh = NULL;
 		U8 mesh_id = 0;
-		bool found_mesh_id = FALSE;
+		bool found_mesh_id = false;
 
 		/* if (type == "hairMesh")
 			switch(lod)
@@ -1117,7 +1117,7 @@ bool LLAvatarAppearance::loadMeshNodes()
 			if (type.compare(mesh_dict->mName) == 0)
 			{
 				mesh_id = mesh_index;
-				found_mesh_id = TRUE;
+				found_mesh_id = true;
 				break;
 			}
 		}
@@ -1257,12 +1257,12 @@ bool LLAvatarAppearance::loadLayersets()
 				LLTexLayerInterface* layer = layer_set->findLayerByName(morph->mLayer);
 				if (layer)
 				{
-					layer->setHasMorph(TRUE);
+					layer->setHasMorph(true);
 				}
 				else
 				{
 					LL_WARNS() << "Could not find layer named " << morph->mLayer << " to set morph flag" << LL_ENDL;
-					success = FALSE;
+					success = false;
 				}
 			}
 		}
@@ -1564,7 +1564,7 @@ bool LLAvatarBoneInfo::parseXml(LLXmlTreeNode* node)
 {
 	if (node->hasName("bone"))
 	{
-		mIsJoint = TRUE;
+		mIsJoint = true;
 		static LLStdStringHandle name_string = LLXmlTree::addAttributeString("name");
 		if (!node->getFastAttributeString(name_string, mName))
 		{
@@ -1577,7 +1577,7 @@ bool LLAvatarBoneInfo::parseXml(LLXmlTreeNode* node)
 	}
 	else if (node->hasName("collision_volume"))
 	{
-		mIsJoint = FALSE;
+		mIsJoint = false;
 		static LLStdStringHandle name_string = LLXmlTree::addAttributeString("name");
 		if (!node->getFastAttributeString(name_string, mName))
 		{
@@ -1810,13 +1810,13 @@ bool LLAvatarAppearance::LLAvatarXmlInfo::parseXmlSkeletonNode(LLXmlTreeNode* ro
 		static LLStdStringHandle position_string = LLXmlTree::addAttributeString("position");
 		if (child->getFastAttributeVector3(position_string, info->mPosition))
 		{
-			info->mHasPosition = TRUE;
+			info->mHasPosition = true;
 		}
 
 		static LLStdStringHandle rotation_string = LLXmlTree::addAttributeString("rotation");
 		if (child->getFastAttributeVector3(rotation_string, info->mRotationEuler))
 		{
-			info->mHasRotation = TRUE;
+			info->mHasRotation = true;
 		}
 		 static LLStdStringHandle group_string = LLXmlTree::addAttributeString("group");
 		if (child->getFastAttributeS32(group_string, info->mGroup))
@@ -1926,7 +1926,7 @@ bool LLAvatarAppearance::LLAvatarXmlInfo::parseXmlMeshNodes(LLXmlTreeNode* root)
 				delete info;
 				return false;
 			}
-			BOOL shared = false;
+			bool shared = false;
 			static LLStdStringHandle shared_string = LLXmlTree::addAttributeString("shared");
 			child->getFastAttributeBOOL(shared_string, shared);
 
@@ -2107,7 +2107,7 @@ bool LLAvatarAppearance::LLAvatarXmlInfo::parseXmlMorphNodes(LLXmlTreeNode* root
 }
 
 //virtual 
-LLAvatarAppearance::LLMaskedMorph::LLMaskedMorph(LLVisualParam *morph_target, BOOL invert, std::string layer) :
+LLAvatarAppearance::LLMaskedMorph::LLMaskedMorph(LLVisualParam *morph_target, bool invert, std::string layer) :
 			mMorphTarget(morph_target),
 			mInvert(invert),
 			mLayer(layer)
diff --git a/indra/llappearance/llavatarappearance.h b/indra/llappearance/llavatarappearance.h
index f3c74c052f..dd16a27a3c 100644
--- a/indra/llappearance/llavatarappearance.h
+++ b/indra/llappearance/llavatarappearance.h
@@ -381,7 +381,7 @@ protected:
 
 		struct LLAvatarMeshInfo
 		{
-			typedef std::pair<LLViewerVisualParamInfo*,BOOL> morph_info_pair_t; // LLPolyMorphTargetInfo stored here
+			typedef std::pair<LLViewerVisualParamInfo*,bool> morph_info_pair_t; // LLPolyMorphTargetInfo stored here
 			typedef std::vector<morph_info_pair_t> morph_info_list_t;
 
 			LLAvatarMeshInfo() : mLOD(0), mMinPixelArea(.1f) {}
@@ -410,8 +410,8 @@ protected:
 		struct LLAvatarAttachmentInfo
 		{
 			LLAvatarAttachmentInfo()
-				: mGroup(-1), mAttachmentID(-1), mPieMenuSlice(-1), mVisibleFirstPerson(FALSE),
-				  mIsHUDAttachment(FALSE), mHasPosition(FALSE), mHasRotation(FALSE) {}
+				: mGroup(-1), mAttachmentID(-1), mPieMenuSlice(-1), mVisibleFirstPerson(false),
+				  mIsHUDAttachment(false), mHasPosition(false), mHasRotation(false) {}
 			std::string mName;
 			std::string mJointName;
 			LLVector3 mPosition;
@@ -419,8 +419,8 @@ protected:
 			S32 mGroup;
 			S32 mAttachmentID;
 			S32 mPieMenuSlice;
-			BOOL mVisibleFirstPerson;
-			BOOL mIsHUDAttachment;
+			bool mVisibleFirstPerson;
+			bool mIsHUDAttachment;
 			bool mHasPosition;
 			bool mHasRotation;
 		};
@@ -440,11 +440,11 @@ protected:
 		struct LLAvatarMorphInfo
 		{
 			LLAvatarMorphInfo()
-				: mInvert(FALSE) {}
+				: mInvert(false) {}
 			std::string mName;
 			std::string mRegion;
 			std::string mLayer;
-			BOOL mInvert;
+			bool mInvert;
 		};
 
 		typedef std::vector<LLAvatarMorphInfo*> morph_info_list_t;
@@ -455,7 +455,7 @@ protected:
 	class LLMaskedMorph
 	{
 	public:
-		LLMaskedMorph(LLVisualParam *morph_target, BOOL invert, std::string layer);
+		LLMaskedMorph(LLVisualParam *morph_target, bool invert, std::string layer);
 
 		LLVisualParam	*mMorphTarget;
 		bool				mInvert;
diff --git a/indra/llappearance/llavatarappearancedefines.cpp b/indra/llappearance/llavatarappearancedefines.cpp
index f3f26be4b9..7af1c37824 100644
--- a/indra/llappearance/llavatarappearancedefines.cpp
+++ b/indra/llappearance/llavatarappearancedefines.cpp
@@ -39,56 +39,56 @@ using namespace LLAvatarAppearanceDefines;
 
 LLAvatarAppearanceDictionary::Textures::Textures()
 {
-	addEntry(TEX_HEAD_BODYPAINT,              new TextureEntry("head_bodypaint",   TRUE,  BAKED_NUM_INDICES, "",                          LLWearableType::WT_SKIN));
-	addEntry(TEX_UPPER_SHIRT,                 new TextureEntry("upper_shirt",      TRUE,  BAKED_NUM_INDICES, "UIImgDefaultShirtUUID",     LLWearableType::WT_SHIRT));
-	addEntry(TEX_LOWER_PANTS,                 new TextureEntry("lower_pants",      TRUE,  BAKED_NUM_INDICES, "UIImgDefaultPantsUUID",     LLWearableType::WT_PANTS));
-	addEntry(TEX_EYES_IRIS,                   new TextureEntry("eyes_iris",        TRUE,  BAKED_NUM_INDICES, "UIImgDefaultEyesUUID",      LLWearableType::WT_EYES));
-	addEntry(TEX_HAIR,                        new TextureEntry("hair_grain",       TRUE,  BAKED_NUM_INDICES, "UIImgDefaultHairUUID",      LLWearableType::WT_HAIR));
-	addEntry(TEX_UPPER_BODYPAINT,             new TextureEntry("upper_bodypaint",  TRUE,  BAKED_NUM_INDICES, "",                          LLWearableType::WT_SKIN));
-	addEntry(TEX_LOWER_BODYPAINT,             new TextureEntry("lower_bodypaint",  TRUE,  BAKED_NUM_INDICES, "",                          LLWearableType::WT_SKIN));
-	addEntry(TEX_LOWER_SHOES,                 new TextureEntry("lower_shoes",      TRUE,  BAKED_NUM_INDICES, "UIImgDefaultShoesUUID",     LLWearableType::WT_SHOES));
-	addEntry(TEX_LOWER_SOCKS,                 new TextureEntry("lower_socks",      TRUE,  BAKED_NUM_INDICES, "UIImgDefaultSocksUUID",     LLWearableType::WT_SOCKS));
-	addEntry(TEX_UPPER_JACKET,                new TextureEntry("upper_jacket",     TRUE,  BAKED_NUM_INDICES, "UIImgDefaultJacketUUID",    LLWearableType::WT_JACKET));
-	addEntry(TEX_LOWER_JACKET,                new TextureEntry("lower_jacket",     TRUE,  BAKED_NUM_INDICES, "UIImgDefaultJacketUUID",    LLWearableType::WT_JACKET));
-	addEntry(TEX_UPPER_GLOVES,                new TextureEntry("upper_gloves",     TRUE,  BAKED_NUM_INDICES, "UIImgDefaultGlovesUUID",    LLWearableType::WT_GLOVES));
-	addEntry(TEX_UPPER_UNDERSHIRT,            new TextureEntry("upper_undershirt", TRUE,  BAKED_NUM_INDICES, "UIImgDefaultUnderwearUUID", LLWearableType::WT_UNDERSHIRT));
-	addEntry(TEX_LOWER_UNDERPANTS,            new TextureEntry("lower_underpants", TRUE,  BAKED_NUM_INDICES, "UIImgDefaultUnderwearUUID", LLWearableType::WT_UNDERPANTS));
-	addEntry(TEX_SKIRT,                       new TextureEntry("skirt",            TRUE,  BAKED_NUM_INDICES, "UIImgDefaultSkirtUUID",     LLWearableType::WT_SKIRT));
-
-	addEntry(TEX_LOWER_ALPHA,                 new TextureEntry("lower_alpha",      TRUE,  BAKED_NUM_INDICES, "UIImgDefaultAlphaUUID",     LLWearableType::WT_ALPHA));
-	addEntry(TEX_UPPER_ALPHA,                 new TextureEntry("upper_alpha",      TRUE,  BAKED_NUM_INDICES, "UIImgDefaultAlphaUUID",     LLWearableType::WT_ALPHA));
-	addEntry(TEX_HEAD_ALPHA,                  new TextureEntry("head_alpha",       TRUE,  BAKED_NUM_INDICES, "UIImgDefaultAlphaUUID",     LLWearableType::WT_ALPHA));
-	addEntry(TEX_EYES_ALPHA,                  new TextureEntry("eyes_alpha",       TRUE,  BAKED_NUM_INDICES, "UIImgDefaultAlphaUUID",     LLWearableType::WT_ALPHA));
-	addEntry(TEX_HAIR_ALPHA,                  new TextureEntry("hair_alpha",       TRUE,  BAKED_NUM_INDICES, "UIImgDefaultAlphaUUID",     LLWearableType::WT_ALPHA));
-
-	addEntry(TEX_HEAD_TATTOO,                 new TextureEntry("head_tattoo",      TRUE,  BAKED_NUM_INDICES, "",     LLWearableType::WT_TATTOO));
-	addEntry(TEX_UPPER_TATTOO,                new TextureEntry("upper_tattoo",     TRUE,  BAKED_NUM_INDICES, "",     LLWearableType::WT_TATTOO));
-	addEntry(TEX_LOWER_TATTOO,                new TextureEntry("lower_tattoo",     TRUE,  BAKED_NUM_INDICES, "",     LLWearableType::WT_TATTOO));
-
-	addEntry(TEX_HEAD_UNIVERSAL_TATTOO,		  new TextureEntry("head_universal_tattoo", TRUE, BAKED_NUM_INDICES, "", LLWearableType::WT_UNIVERSAL));
-	addEntry(TEX_UPPER_UNIVERSAL_TATTOO,	  new TextureEntry("upper_universal_tattoo", TRUE, BAKED_NUM_INDICES, "", LLWearableType::WT_UNIVERSAL));
-	addEntry(TEX_LOWER_UNIVERSAL_TATTOO,      new TextureEntry("lower_universal_tattoo", TRUE, BAKED_NUM_INDICES, "", LLWearableType::WT_UNIVERSAL));
-	addEntry(TEX_SKIRT_TATTOO,				  new TextureEntry("skirt_tattoo",	   TRUE,  BAKED_NUM_INDICES, "",	 LLWearableType::WT_UNIVERSAL));
-	addEntry(TEX_HAIR_TATTOO,				  new TextureEntry("hair_tattoo",	   TRUE,  BAKED_NUM_INDICES, "",	 LLWearableType::WT_UNIVERSAL));
-	addEntry(TEX_EYES_TATTOO,				  new TextureEntry("eyes_tattoo",      TRUE,  BAKED_NUM_INDICES, "",	 LLWearableType::WT_UNIVERSAL));
-	addEntry(TEX_LEFT_ARM_TATTOO,			  new TextureEntry("leftarm_tattoo",   TRUE,  BAKED_NUM_INDICES, "",	 LLWearableType::WT_UNIVERSAL));
-	addEntry(TEX_LEFT_LEG_TATTOO,			  new TextureEntry("leftleg_tattoo",   TRUE,  BAKED_NUM_INDICES, "",	 LLWearableType::WT_UNIVERSAL));
-	addEntry(TEX_AUX1_TATTOO,				  new TextureEntry("aux1_tattoo",      TRUE,  BAKED_NUM_INDICES, "",	 LLWearableType::WT_UNIVERSAL));
-	addEntry(TEX_AUX2_TATTOO,				  new TextureEntry("aux2_tattoo",      TRUE,  BAKED_NUM_INDICES, "",	 LLWearableType::WT_UNIVERSAL));
-	addEntry(TEX_AUX3_TATTOO,				  new TextureEntry("aux3_tattoo",      TRUE,  BAKED_NUM_INDICES, "",	 LLWearableType::WT_UNIVERSAL));
-
-
-	addEntry(TEX_HEAD_BAKED,                  new TextureEntry("head-baked",       FALSE, BAKED_HEAD, "head"));
-	addEntry(TEX_UPPER_BAKED,                 new TextureEntry("upper-baked",      FALSE, BAKED_UPPER, "upper"));
-	addEntry(TEX_LOWER_BAKED,                 new TextureEntry("lower-baked",      FALSE, BAKED_LOWER, "lower"));
-	addEntry(TEX_EYES_BAKED,                  new TextureEntry("eyes-baked",       FALSE, BAKED_EYES, "eyes"));
-	addEntry(TEX_HAIR_BAKED,                  new TextureEntry("hair-baked",       FALSE, BAKED_HAIR, "hair"));
-	addEntry(TEX_SKIRT_BAKED,                 new TextureEntry("skirt-baked",      FALSE, BAKED_SKIRT, "skirt"));
-	addEntry(TEX_LEFT_ARM_BAKED,			  new TextureEntry("leftarm-baked",   FALSE, BAKED_LEFT_ARM, "leftarm"));
-	addEntry(TEX_LEFT_LEG_BAKED,		      new TextureEntry("leftleg-baked",  FALSE, BAKED_LEFT_LEG, "leftleg"));
-	addEntry(TEX_AUX1_BAKED,				  new TextureEntry("aux1-baked",	   FALSE, BAKED_AUX1, "aux1"));
-	addEntry(TEX_AUX2_BAKED,				  new TextureEntry("aux2-baked",	   FALSE, BAKED_AUX2, "aux2"));
-	addEntry(TEX_AUX3_BAKED,				  new TextureEntry("aux3-baked",	   FALSE, BAKED_AUX3, "aux3"));
+	addEntry(TEX_HEAD_BODYPAINT,              new TextureEntry("head_bodypaint",   true,  BAKED_NUM_INDICES, "",                          LLWearableType::WT_SKIN));
+	addEntry(TEX_UPPER_SHIRT,                 new TextureEntry("upper_shirt",      true,  BAKED_NUM_INDICES, "UIImgDefaultShirtUUID",     LLWearableType::WT_SHIRT));
+	addEntry(TEX_LOWER_PANTS,                 new TextureEntry("lower_pants",      true,  BAKED_NUM_INDICES, "UIImgDefaultPantsUUID",     LLWearableType::WT_PANTS));
+	addEntry(TEX_EYES_IRIS,                   new TextureEntry("eyes_iris",        true,  BAKED_NUM_INDICES, "UIImgDefaultEyesUUID",      LLWearableType::WT_EYES));
+	addEntry(TEX_HAIR,                        new TextureEntry("hair_grain",       true,  BAKED_NUM_INDICES, "UIImgDefaultHairUUID",      LLWearableType::WT_HAIR));
+	addEntry(TEX_UPPER_BODYPAINT,             new TextureEntry("upper_bodypaint",  true,  BAKED_NUM_INDICES, "",                          LLWearableType::WT_SKIN));
+	addEntry(TEX_LOWER_BODYPAINT,             new TextureEntry("lower_bodypaint",  true,  BAKED_NUM_INDICES, "",                          LLWearableType::WT_SKIN));
+	addEntry(TEX_LOWER_SHOES,                 new TextureEntry("lower_shoes",      true,  BAKED_NUM_INDICES, "UIImgDefaultShoesUUID",     LLWearableType::WT_SHOES));
+	addEntry(TEX_LOWER_SOCKS,                 new TextureEntry("lower_socks",      true,  BAKED_NUM_INDICES, "UIImgDefaultSocksUUID",     LLWearableType::WT_SOCKS));
+	addEntry(TEX_UPPER_JACKET,                new TextureEntry("upper_jacket",     true,  BAKED_NUM_INDICES, "UIImgDefaultJacketUUID",    LLWearableType::WT_JACKET));
+	addEntry(TEX_LOWER_JACKET,                new TextureEntry("lower_jacket",     true,  BAKED_NUM_INDICES, "UIImgDefaultJacketUUID",    LLWearableType::WT_JACKET));
+	addEntry(TEX_UPPER_GLOVES,                new TextureEntry("upper_gloves",     true,  BAKED_NUM_INDICES, "UIImgDefaultGlovesUUID",    LLWearableType::WT_GLOVES));
+	addEntry(TEX_UPPER_UNDERSHIRT,            new TextureEntry("upper_undershirt", true,  BAKED_NUM_INDICES, "UIImgDefaultUnderwearUUID", LLWearableType::WT_UNDERSHIRT));
+	addEntry(TEX_LOWER_UNDERPANTS,            new TextureEntry("lower_underpants", true,  BAKED_NUM_INDICES, "UIImgDefaultUnderwearUUID", LLWearableType::WT_UNDERPANTS));
+	addEntry(TEX_SKIRT,                       new TextureEntry("skirt",            true,  BAKED_NUM_INDICES, "UIImgDefaultSkirtUUID",     LLWearableType::WT_SKIRT));
+
+	addEntry(TEX_LOWER_ALPHA,                 new TextureEntry("lower_alpha",      true,  BAKED_NUM_INDICES, "UIImgDefaultAlphaUUID",     LLWearableType::WT_ALPHA));
+	addEntry(TEX_UPPER_ALPHA,                 new TextureEntry("upper_alpha",      true,  BAKED_NUM_INDICES, "UIImgDefaultAlphaUUID",     LLWearableType::WT_ALPHA));
+	addEntry(TEX_HEAD_ALPHA,                  new TextureEntry("head_alpha",       true,  BAKED_NUM_INDICES, "UIImgDefaultAlphaUUID",     LLWearableType::WT_ALPHA));
+	addEntry(TEX_EYES_ALPHA,                  new TextureEntry("eyes_alpha",       true,  BAKED_NUM_INDICES, "UIImgDefaultAlphaUUID",     LLWearableType::WT_ALPHA));
+	addEntry(TEX_HAIR_ALPHA,                  new TextureEntry("hair_alpha",       true,  BAKED_NUM_INDICES, "UIImgDefaultAlphaUUID",     LLWearableType::WT_ALPHA));
+
+	addEntry(TEX_HEAD_TATTOO,                 new TextureEntry("head_tattoo",      true,  BAKED_NUM_INDICES, "",     LLWearableType::WT_TATTOO));
+	addEntry(TEX_UPPER_TATTOO,                new TextureEntry("upper_tattoo",     true,  BAKED_NUM_INDICES, "",     LLWearableType::WT_TATTOO));
+	addEntry(TEX_LOWER_TATTOO,                new TextureEntry("lower_tattoo",     true,  BAKED_NUM_INDICES, "",     LLWearableType::WT_TATTOO));
+
+	addEntry(TEX_HEAD_UNIVERSAL_TATTOO,		  new TextureEntry("head_universal_tattoo", true, BAKED_NUM_INDICES, "", LLWearableType::WT_UNIVERSAL));
+	addEntry(TEX_UPPER_UNIVERSAL_TATTOO,	  new TextureEntry("upper_universal_tattoo", true, BAKED_NUM_INDICES, "", LLWearableType::WT_UNIVERSAL));
+	addEntry(TEX_LOWER_UNIVERSAL_TATTOO,      new TextureEntry("lower_universal_tattoo", true, BAKED_NUM_INDICES, "", LLWearableType::WT_UNIVERSAL));
+	addEntry(TEX_SKIRT_TATTOO,				  new TextureEntry("skirt_tattoo",	   true,  BAKED_NUM_INDICES, "",	 LLWearableType::WT_UNIVERSAL));
+	addEntry(TEX_HAIR_TATTOO,				  new TextureEntry("hair_tattoo",	   true,  BAKED_NUM_INDICES, "",	 LLWearableType::WT_UNIVERSAL));
+	addEntry(TEX_EYES_TATTOO,				  new TextureEntry("eyes_tattoo",      true,  BAKED_NUM_INDICES, "",	 LLWearableType::WT_UNIVERSAL));
+	addEntry(TEX_LEFT_ARM_TATTOO,			  new TextureEntry("leftarm_tattoo",   true,  BAKED_NUM_INDICES, "",	 LLWearableType::WT_UNIVERSAL));
+	addEntry(TEX_LEFT_LEG_TATTOO,			  new TextureEntry("leftleg_tattoo",   true,  BAKED_NUM_INDICES, "",	 LLWearableType::WT_UNIVERSAL));
+	addEntry(TEX_AUX1_TATTOO,				  new TextureEntry("aux1_tattoo",      true,  BAKED_NUM_INDICES, "",	 LLWearableType::WT_UNIVERSAL));
+	addEntry(TEX_AUX2_TATTOO,				  new TextureEntry("aux2_tattoo",      true,  BAKED_NUM_INDICES, "",	 LLWearableType::WT_UNIVERSAL));
+	addEntry(TEX_AUX3_TATTOO,				  new TextureEntry("aux3_tattoo",      true,  BAKED_NUM_INDICES, "",	 LLWearableType::WT_UNIVERSAL));
+
+
+	addEntry(TEX_HEAD_BAKED,                  new TextureEntry("head-baked",       false, BAKED_HEAD, "head"));
+	addEntry(TEX_UPPER_BAKED,                 new TextureEntry("upper-baked",      false, BAKED_UPPER, "upper"));
+	addEntry(TEX_LOWER_BAKED,                 new TextureEntry("lower-baked",      false, BAKED_LOWER, "lower"));
+	addEntry(TEX_EYES_BAKED,                  new TextureEntry("eyes-baked",       false, BAKED_EYES, "eyes"));
+	addEntry(TEX_HAIR_BAKED,                  new TextureEntry("hair-baked",       false, BAKED_HAIR, "hair"));
+	addEntry(TEX_SKIRT_BAKED,                 new TextureEntry("skirt-baked",      false, BAKED_SKIRT, "skirt"));
+	addEntry(TEX_LEFT_ARM_BAKED,			  new TextureEntry("leftarm-baked",   false, BAKED_LEFT_ARM, "leftarm"));
+	addEntry(TEX_LEFT_LEG_BAKED,		      new TextureEntry("leftleg-baked",  false, BAKED_LEFT_LEG, "leftleg"));
+	addEntry(TEX_AUX1_BAKED,				  new TextureEntry("aux1-baked",	   false, BAKED_AUX1, "aux1"));
+	addEntry(TEX_AUX2_BAKED,				  new TextureEntry("aux2-baked",	   false, BAKED_AUX2, "aux2"));
+	addEntry(TEX_AUX3_BAKED,				  new TextureEntry("aux3-baked",	   false, BAKED_AUX3, "aux3"));
 }
 
 LLAvatarAppearanceDictionary::BakedTextures::BakedTextures()
diff --git a/indra/llappearance/llavatarappearancedefines.h b/indra/llappearance/llavatarappearancedefines.h
index b90c6664cc..21c0dedeba 100644
--- a/indra/llappearance/llavatarappearancedefines.h
+++ b/indra/llappearance/llavatarappearancedefines.h
@@ -167,10 +167,10 @@ public:
 		const std::string 	mDefaultImageName;
 		const LLWearableType::EType mWearableType;
 		// It's either a local texture xor baked
-		BOOL 				mIsLocalTexture;
-		BOOL 				mIsBakedTexture;
+		bool 				mIsLocalTexture;
+		bool 				mIsBakedTexture;
 		// If it's a local texture, it may be used by a baked texture
-		BOOL 				mIsUsedByBakedTexture;
+		bool 				mIsUsedByBakedTexture;
 		EBakedTextureIndex 	mBakedTextureIndex;
 	};
 
diff --git a/indra/llappearance/llavatarjoint.cpp b/indra/llappearance/llavatarjoint.cpp
index e7bd831b49..579381958c 100644
--- a/indra/llappearance/llavatarjoint.cpp
+++ b/indra/llappearance/llavatarjoint.cpp
@@ -40,7 +40,7 @@ const F32 DEFAULT_AVATAR_JOINT_LOD = 0.0f;
 //-----------------------------------------------------------------------------
 // Static Data
 //-----------------------------------------------------------------------------
-BOOL					LLAvatarJoint::sDisableLOD = FALSE;
+bool					LLAvatarJoint::sDisableLOD = false;
 
 //-----------------------------------------------------------------------------
 // LLAvatarJoint()
@@ -66,13 +66,13 @@ LLAvatarJoint::LLAvatarJoint(const std::string &name, LLJoint *parent) :
 
 void LLAvatarJoint::init()
 {
-	mValid = FALSE;
+	mValid = false;
 	mComponents = SC_JOINT | SC_BONE | SC_AXES;
 	mMinPixelArea = DEFAULT_AVATAR_JOINT_LOD;
 	mPickName = PN_DEFAULT;
-	mVisible = TRUE;
+	mVisible = true;
 	mMeshID = 0;
-	mIsTransparent = FALSE;
+	mIsTransparent = false;
 }
 
 
@@ -88,7 +88,7 @@ LLAvatarJoint::~LLAvatarJoint()
 //--------------------------------------------------------------------
 // setValid()
 //--------------------------------------------------------------------
-void LLAvatarJoint::setValid( BOOL valid, BOOL recursive )
+void LLAvatarJoint::setValid( bool valid, bool recursive )
 {
 	//----------------------------------------------------------------
 	// set visibility for this joint
@@ -103,7 +103,7 @@ void LLAvatarJoint::setValid( BOOL valid, BOOL recursive )
 		for (LLJoint* child : mChildren)
 		{
 			LLAvatarJoint* joint = static_cast<LLAvatarJoint*>(child);
-			joint->setValid(valid, TRUE);
+			joint->setValid(valid, true);
 		}
 	}
 
@@ -112,7 +112,7 @@ void LLAvatarJoint::setValid( BOOL valid, BOOL recursive )
 //--------------------------------------------------------------------
 // setSkeletonComponents()
 //--------------------------------------------------------------------
-void LLAvatarJoint::setSkeletonComponents( U32 comp, BOOL recursive )
+void LLAvatarJoint::setSkeletonComponents( U32 comp, bool recursive )
 {
 	mComponents = comp;
 	if (recursive)
@@ -125,7 +125,7 @@ void LLAvatarJoint::setSkeletonComponents( U32 comp, BOOL recursive )
 	}
 }
 
-void LLAvatarJoint::setVisible(BOOL visible, BOOL recursive)
+void LLAvatarJoint::setVisible(bool visible, bool recursive)
 {
 	mVisible = visible;
 
@@ -148,7 +148,7 @@ void LLAvatarJoint::updateFaceSizes(U32 &num_vertices, U32& num_indices, F32 pix
 	}
 }
 
-void LLAvatarJoint::updateFaceData(LLFace *face, F32 pixel_area, BOOL damp_wind, bool terse_update)
+void LLAvatarJoint::updateFaceData(LLFace *face, F32 pixel_area, bool damp_wind, bool terse_update)
 {
 	for (LLJoint* child : mChildren)
 	{
@@ -180,18 +180,18 @@ bool LLAvatarJoint::updateLOD(F32 pixel_area, bool activate)
 		if (found_lod || jointLOD == DEFAULT_AVATAR_JOINT_LOD)
 		{
 			// we've already found a joint to enable, so enable the rest as alternatives
-			lod_changed |= joint->updateLOD(pixel_area, TRUE);
+			lod_changed |= joint->updateLOD(pixel_area, true);
 		}
 		else
 		{
 			if (pixel_area >= jointLOD || sDisableLOD)
 			{
-				lod_changed |= joint->updateLOD(pixel_area, TRUE);
+				lod_changed |= joint->updateLOD(pixel_area, true);
 				found_lod = true;
 			}
 			else
 			{
-				lod_changed |= joint->updateLOD(pixel_area, FALSE);
+				lod_changed |= joint->updateLOD(pixel_area, false);
 			}
 		}
 	}
@@ -222,11 +222,11 @@ void LLAvatarJoint::setMeshesToChildren()
 
 LLAvatarJointCollisionVolume::LLAvatarJointCollisionVolume()
 {
-	mUpdateXform = FALSE;
+	mUpdateXform = false;
 }
 
 /*virtual*/
-U32 LLAvatarJointCollisionVolume::render( F32 pixelArea, BOOL first_pass, BOOL is_dummy )
+U32 LLAvatarJointCollisionVolume::render( F32 pixelArea, bool first_pass, bool is_dummy )
 {
 	LL_ERRS() << "Cannot call render() on LLAvatarJointCollisionVolume" << LL_ENDL;
 	return 0;
@@ -234,7 +234,7 @@ U32 LLAvatarJointCollisionVolume::render( F32 pixelArea, BOOL first_pass, BOOL i
 
 LLVector3 LLAvatarJointCollisionVolume::getVolumePos(LLVector3 &offset)
 {
-	mUpdateXform = TRUE;
+	mUpdateXform = true;
 	
 	LLVector3 result = offset;
 	result.scaleVec(getScale());
diff --git a/indra/llappearance/llavatarjoint.h b/indra/llappearance/llavatarjoint.h
index 052852fa3d..09269bbc3f 100644
--- a/indra/llappearance/llavatarjoint.h
+++ b/indra/llappearance/llavatarjoint.h
@@ -52,14 +52,14 @@ public:
 	virtual ~LLAvatarJoint();
 
 	// Gets the validity of this joint
-	BOOL getValid() { return mValid; }
+	bool getValid() { return mValid; }
 
 	// Sets the validity of this joint
-	virtual void setValid( BOOL valid, BOOL recursive=FALSE );
+	virtual void setValid( bool valid, bool recursive=false );
 
 	// Returns true if this object is transparent.
 	// This is used to determine in which order to draw objects.
-	virtual BOOL isTransparent() { return mIsTransparent; }
+	virtual bool isTransparent() { return mIsTransparent; }
 
 	// Returns true if this object should inherit scale modifiers from its immediate parent
 	virtual bool inheritScale() { return false; }
@@ -72,7 +72,7 @@ public:
 	};
 
 	// Selects which skeleton components to draw
-	void setSkeletonComponents( U32 comp, BOOL recursive = TRUE );
+	void setSkeletonComponents( U32 comp, bool recursive = true );
 
 	// Returns which skeleton components are enables for drawing
 	U32 getSkeletonComponents() { return mComponents; }
@@ -90,34 +90,34 @@ public:
 	void setPickName(LLJointPickName name) { mPickName = name; }
 	LLJointPickName getPickName() { return mPickName; }
 
-	void setVisible( BOOL visible, BOOL recursive );
+	void setVisible( bool visible, bool recursive );
 
 	// Takes meshes in mMeshParts and sets each one as a child joint
 	void setMeshesToChildren();
 
 	// LLViewerJoint interface
-	virtual U32 render( F32 pixelArea, BOOL first_pass = TRUE, BOOL is_dummy = FALSE ) = 0;
+	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 void updateFaceData(LLFace *face, F32 pixel_area, bool damp_wind = false, bool terse_update = false);
 	virtual bool updateLOD(F32 pixel_area, bool activate);
 	virtual void updateJointGeometry();
 	virtual void dump();
 	
 
 public:
-	static BOOL	sDisableLOD;
+	static bool	sDisableLOD;
 	avatar_joint_mesh_list_t mMeshParts; //LLViewerJointMesh*
 	void setMeshID( S32 id ) {mMeshID = id;}
 
 protected:
 	void init();
 
-	BOOL		mValid;
-	BOOL		mIsTransparent;
+	bool		mValid;
+	bool		mIsTransparent;
 	U32			mComponents;
 	F32			mMinPixelArea;
 	LLJointPickName	mPickName;
-	BOOL		mVisible;
+	bool		mVisible;
 	S32			mMeshID;
 };
 
@@ -128,7 +128,7 @@ public:
 	virtual ~LLAvatarJointCollisionVolume() {};
 
 	/*virtual*/ bool inheritScale() { return true; }
-	/*virtual*/ U32 render( F32 pixelArea, BOOL first_pass = TRUE, BOOL is_dummy = FALSE );
+	/*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 f34e23a966..9b2a1d9b4c 100644
--- a/indra/llappearance/llavatarjointmesh.cpp
+++ b/indra/llappearance/llavatarjointmesh.cpp
@@ -247,7 +247,7 @@ void LLAvatarJointMesh::setTexture( LLGLTexture *texture )
 	{
 		mLayerSet = NULL;
 		//texture->bindTexture(0);
-		//texture->setClamp(TRUE, TRUE);
+		//texture->setClamp(true, true);
 	}
 }
 
diff --git a/indra/llappearance/llavatarjointmesh.h b/indra/llappearance/llavatarjointmesh.h
index a3f6a61218..57cf5a26f8 100644
--- a/indra/llappearance/llavatarjointmesh.h
+++ b/indra/llappearance/llavatarjointmesh.h
@@ -69,7 +69,7 @@ protected:
 	LLTexLayerSet*				mLayerSet;		// ptr to a layer set owned by the avatar
 	U32 						mTestImageName;		// handle to a temporary texture for previewing uploads
 	LLPolyMesh*					mMesh;			// ptr to a global polymesh
-	BOOL						mCullBackFaces;	// true by default
+	bool						mCullBackFaces;	// true by default
 	LLFace*						mFace;			// ptr to a face w/ AGP copy of mesh
 
 	U32							mFaceIndexCount;
@@ -131,7 +131,7 @@ public:
 	// Gets ID for picking
 	S32 getMeshID() { return mMeshID; }	
 
-	void setIsTransparent(BOOL is_transparent) { mIsTransparent = is_transparent; }
+	void setIsTransparent(bool is_transparent) { mIsTransparent = is_transparent; }
 
 private:
 	// Allocate skin data
diff --git a/indra/llappearance/lldriverparam.cpp b/indra/llappearance/lldriverparam.cpp
index 83f2ab1266..e832176ae8 100644
--- a/indra/llappearance/lldriverparam.cpp
+++ b/indra/llappearance/lldriverparam.cpp
@@ -461,14 +461,14 @@ void LLDriverParam::stopAnimating()
 
 	for(LLDrivenEntry& driven : mDriven)
 	{
-		driven.mParam->setAnimating(FALSE);
+		driven.mParam->setAnimating(false);
 	}
 }
 
 /*virtual*/ 
 bool LLDriverParam::linkDrivenParams(visual_param_mapper mapper, bool only_cross_params)
 {
-	BOOL success = true;
+	bool success = true;
 	for (LLDrivenEntryInfo& driven_info : getInfo()->mDrivenInfoList)
 	{
 		S32 driven_id = driven_info.mDrivenID;
diff --git a/indra/llappearance/lllocaltextureobject.cpp b/indra/llappearance/lllocaltextureobject.cpp
index ff82e4e8e3..84c0fd8380 100644
--- a/indra/llappearance/lllocaltextureobject.cpp
+++ b/indra/llappearance/lllocaltextureobject.cpp
@@ -36,14 +36,14 @@
 
 
 LLLocalTextureObject::LLLocalTextureObject() :
-	mIsBakedReady(FALSE),
+	mIsBakedReady(false),
 	mDiscard(MAX_DISCARD_LEVEL+1)
 {
 	mImage = NULL;
 }
 
 LLLocalTextureObject::LLLocalTextureObject(LLGLTexture* image, const LLUUID& id) :
-	mIsBakedReady(FALSE),
+	mIsBakedReady(false),
 	mDiscard(MAX_DISCARD_LEVEL+1)
 {
 	mImage = image;
@@ -206,7 +206,7 @@ void LLLocalTextureObject::setDiscard(S32 new_discard)
 	mDiscard = new_discard;
 }
 
-void LLLocalTextureObject::setBakedReady(BOOL ready)
+void LLLocalTextureObject::setBakedReady(bool ready)
 {
 	mIsBakedReady = ready;
 }
diff --git a/indra/llappearance/lllocaltextureobject.h b/indra/llappearance/lllocaltextureobject.h
index 5ca503baf4..a5118ffde3 100644
--- a/indra/llappearance/lllocaltextureobject.h
+++ b/indra/llappearance/lllocaltextureobject.h
@@ -63,7 +63,7 @@ public:
 
 	void setID(LLUUID new_id);
 	void setDiscard(S32 new_discard);
-	void setBakedReady(BOOL ready);
+	void setBakedReady(bool ready);
 
 protected:
 
@@ -78,7 +78,7 @@ private:
 
 	LLUUID			mID;
 
-	BOOL mIsBakedReady;
+	bool mIsBakedReady;
 	S32 mDiscard;
 };
 
diff --git a/indra/llappearance/llpolymesh.cpp b/indra/llappearance/llpolymesh.cpp
index a51d4dec7e..42a37c4e16 100644
--- a/indra/llappearance/llpolymesh.cpp
+++ b/indra/llappearance/llpolymesh.cpp
@@ -72,8 +72,8 @@ LLPolyMeshSharedData::LLPolyMeshSharedData()
         mTexCoords = NULL;
         mDetailTexCoords = NULL;
         mWeights = NULL;
-        mHasWeights = FALSE;
-        mHasDetailTexCoords = FALSE;
+        mHasWeights = false;
+        mHasDetailTexCoords = false;
 
         mNumFaces = 0;
         mFaces = NULL;
@@ -615,7 +615,7 @@ bool LLPolyMeshSharedData::loadMesh( const std::string& fileName )
                                 std::string morph_name(morphName);
                                 LLPolyMorphData* morph_data = new LLPolyMorphData(morph_name);
 
-                                BOOL result = morph_data->loadBinary(fp, this);
+                                bool result = morph_data->loadBinary(fp, this);
 
                                 if (!result)
                                 {
@@ -705,12 +705,12 @@ bool LLPolyMeshSharedData::loadMesh( const std::string& fileName )
                         }
                 }
 
-                status = TRUE;
+                status = true;
         }
         else
         {
                 LL_ERRS() << "invalid mesh file header: " << fileName << LL_ENDL;
-                status = FALSE;
+                status = false;
         }
 
         if (0 == mNumJointNames)
diff --git a/indra/llappearance/llpolymesh.h b/indra/llappearance/llpolymesh.h
index 040868ea2a..e0822bf0e7 100644
--- a/indra/llappearance/llpolymesh.h
+++ b/indra/llappearance/llpolymesh.h
@@ -79,8 +79,8 @@ private:
 	LLVector2				*mDetailTexCoords;
 	F32						*mWeights;
 	
-	BOOL					mHasWeights;
-	BOOL					mHasDetailTexCoords;
+	bool					mHasWeights;
+	bool					mHasDetailTexCoords;
 
 	// face data			
 	S32						mNumFaces;
@@ -138,7 +138,7 @@ public:
 
 	const S32	*getSharedVert(S32 vert);
 
-	BOOL isLOD() { return (mReferenceData != NULL); }
+	bool isLOD() { return (mReferenceData != NULL); }
 };
 
 
@@ -204,13 +204,13 @@ public:
 	}
 
 	// Returns whether or not the mesh has detail texture coords
-	BOOL hasDetailTexCoords() { 
+	bool hasDetailTexCoords() {
 		llassert (mSharedData);
 		return mSharedData->mHasDetailTexCoords; 
 	}
 
 	// Returns whether or not the mesh has vertex weights
-	BOOL hasWeights() const{ 
+	bool hasWeights() const{
 		llassert (mSharedData);
 		return mSharedData->mHasWeights; 
 	}
@@ -316,7 +316,7 @@ public:
 	// Get indices
 	U32*	getIndices() { return mSharedData ? mSharedData->mTriangleIndices : NULL; }
 
-	BOOL	isLOD() { return mSharedData && mSharedData->isLOD(); }
+	bool	isLOD() { return mSharedData && mSharedData->isLOD(); }
 
 	void setAvatar(LLAvatarAppearance* avatarp) { mAvatarp = avatarp; }
 	LLAvatarAppearance* getAvatar() { return mAvatarp; }
diff --git a/indra/llappearance/llpolymorph.cpp b/indra/llappearance/llpolymorph.cpp
index 73811a550c..4b94ed48b1 100644
--- a/indra/llappearance/llpolymorph.cpp
+++ b/indra/llappearance/llpolymorph.cpp
@@ -256,7 +256,7 @@ void LLPolyMorphData::freeData()
 // LLPolyMorphTargetInfo()
 //-----------------------------------------------------------------------------
 LLPolyMorphTargetInfo::LLPolyMorphTargetInfo()
-	: mIsClothingMorph(FALSE)
+	: mIsClothingMorph(false)
 {
 }
 
@@ -659,7 +659,7 @@ void LLPolyMorphTarget::apply( ESex avatar_sex )
 //-----------------------------------------------------------------------------
 // applyMask()
 //-----------------------------------------------------------------------------
-void	LLPolyMorphTarget::applyMask(const U8 *maskTextureData, S32 width, S32 height, S32 num_components, BOOL invert)
+void	LLPolyMorphTarget::applyMask(const U8 *maskTextureData, S32 width, S32 height, S32 num_components, bool invert)
 {
 	LLVector4a *clothing_weights = getInfo()->mIsClothingMorph ? mMesh->getWritableClothingWeights() : NULL;
 
@@ -749,7 +749,7 @@ void LLPolyMorphTarget::applyVolumeChanges(F32 delta_weight)
 LLPolyVertexMask::LLPolyVertexMask(LLPolyMorphData* morph_data)
 	: mWeights(new F32[morph_data->mNumIndices]),
 	mMorphData(morph_data),
-	mWeightsGenerated(FALSE)
+	mWeightsGenerated(false)
 {
 	llassert(mMorphData != NULL);
 	llassert(mMorphData->mNumIndices > 0);
@@ -780,10 +780,10 @@ LLPolyVertexMask::~LLPolyVertexMask()
 //-----------------------------------------------------------------------------
 // generateMask()
 //-----------------------------------------------------------------------------
-void LLPolyVertexMask::generateMask(const U8 *maskTextureData, S32 width, S32 height, S32 num_components, BOOL invert, LLVector4a *clothing_weights)
+void LLPolyVertexMask::generateMask(const U8 *maskTextureData, S32 width, S32 height, S32 num_components, bool invert, LLVector4a *clothing_weights)
 {
 // RN debug output that uses Image Debugger (http://www.cs.unc.edu/~baxter/projects/imdebug/)
-//	BOOL debugImg = FALSE; 
+//	bool debugImg = false;
 //	if (debugImg)
 //	{
 //		if (invert)
@@ -827,7 +827,7 @@ void LLPolyVertexMask::generateMask(const U8 *maskTextureData, S32 width, S32 he
 			clothing_weights[vertIndex].getF32ptr()[VW] = mWeights[index];
 		}
 	}
-	mWeightsGenerated = TRUE;
+	mWeightsGenerated = true;
 }
 
 //-----------------------------------------------------------------------------
diff --git a/indra/llappearance/llpolymorph.h b/indra/llappearance/llpolymorph.h
index f52e9dce8d..5544344036 100644
--- a/indra/llappearance/llpolymorph.h
+++ b/indra/llappearance/llpolymorph.h
@@ -84,14 +84,14 @@ public:
 	LLPolyVertexMask(const LLPolyVertexMask& pOther);
 	~LLPolyVertexMask();
 
-	void generateMask(const U8 *maskData, S32 width, S32 height, S32 num_components, BOOL invert, LLVector4a *clothing_weights);
+	void generateMask(const U8 *maskData, S32 width, S32 height, S32 num_components, bool invert, LLVector4a *clothing_weights);
 	F32* getMorphMaskWeights();
 
 
 protected:
 	F32*		mWeights;
 	LLPolyMorphData *mMorphData;
-	BOOL			mWeightsGenerated;
+	bool			mWeightsGenerated;
 
 };
 
@@ -133,7 +133,7 @@ public:
 
 protected:
 	std::string		mMorphName;
-	BOOL			mIsClothingMorph;
+	bool			mIsClothingMorph;
 	typedef std::vector<LLPolyVolumeMorphInfo> volume_info_list_t;
 	volume_info_list_t mVolumeInfoList;	
 };
@@ -159,7 +159,7 @@ public:
 	/*virtual*/ LLViewerVisualParam* cloneParam(LLWearable* wearable) const;
 
 	// LLVisualParam Virtual functions
-	///*virtual*/ BOOL				parseData(LLXmlTreeNode* node);
+	///*virtual*/ bool				parseData(LLXmlTreeNode* node);
 	/*virtual*/ void				apply( ESex sex );
 	
 	// LLViewerVisualParam Virtual functions
@@ -170,7 +170,7 @@ public:
 	/*virtual*/ const LLVector4a*	getFirstDistortion(U32 *index, LLPolyMesh **poly_mesh);
 	/*virtual*/ const LLVector4a*	getNextDistortion(U32 *index, LLPolyMesh **poly_mesh);
 
-	void	applyMask(const U8 *maskData, S32 width, S32 height, S32 num_components, BOOL invert);
+	void	applyMask(const U8 *maskData, S32 width, S32 height, S32 num_components, bool invert);
 	void	addPendingMorphMask() { mNumMorphMasksPending++; }
 
     void    applyVolumeChanges(F32 delta_weight); // SL-315 - for resetSkeleton()
@@ -183,7 +183,7 @@ protected:
 	LLPolyVertexMask *				mVertMask;
 	ESex							mLastSex;
 	// number of morph masks that haven't been generated, must be 0 before this morph is applied
-	BOOL							mNumMorphMasksPending;	
+	BOOL							mNumMorphMasksPending;
 
 	typedef std::vector<LLPolyVolumeMorph> volume_list_t;
 	volume_list_t 					mVolumeMorphs;
diff --git a/indra/llappearance/llpolyskeletaldistortion.cpp b/indra/llappearance/llpolyskeletaldistortion.cpp
index e8405ddb1f..3dd21ff62b 100644
--- a/indra/llappearance/llpolyskeletaldistortion.cpp
+++ b/indra/llappearance/llpolyskeletaldistortion.cpp
@@ -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))
diff --git a/indra/llappearance/llpolyskeletaldistortion.h b/indra/llappearance/llpolyskeletaldistortion.h
index 83d9b90d69..4c69f7e70a 100644
--- a/indra/llappearance/llpolyskeletaldistortion.h
+++ b/indra/llappearance/llpolyskeletaldistortion.h
@@ -51,7 +51,7 @@ class LLAvatarAppearance;
 //-----------------------------------------------------------------------------
 struct LLPolySkeletalBoneInfo
 {
-	LLPolySkeletalBoneInfo(std::string &name, LLVector3 &scale, LLVector3 &pos, BOOL haspos)
+	LLPolySkeletalBoneInfo(std::string &name, LLVector3 &scale, LLVector3 &pos, bool haspos)
 		: mBoneName(name),
 		  mScaleDeformation(scale),
 		  mPositionDeformation(pos),
@@ -59,7 +59,7 @@ struct LLPolySkeletalBoneInfo
 	std::string mBoneName;
 	LLVector3 mScaleDeformation;
 	LLVector3 mPositionDeformation;
-	BOOL mHasPositionDeformation;
+	bool mHasPositionDeformation;
 };
 
 class alignas(16) LLPolySkeletalDistortionInfo : public LLViewerVisualParamInfo
@@ -97,7 +97,7 @@ public:
 	/*virtual*/ LLViewerVisualParam* cloneParam(LLWearable* wearable) const;
 
 	// LLVisualParam Virtual functions
-	///*virtual*/ BOOL				parseData(LLXmlTreeNode* node);
+	///*virtual*/ bool				parseData(LLXmlTreeNode* node);
 	/*virtual*/ void				apply( ESex sex );
 	
 	// LLViewerVisualParam Virtual functions
diff --git a/indra/llappearance/lltexglobalcolor.cpp b/indra/llappearance/lltexglobalcolor.cpp
index b450b1284e..cd416d6791 100644
--- a/indra/llappearance/lltexglobalcolor.cpp
+++ b/indra/llappearance/lltexglobalcolor.cpp
@@ -58,7 +58,7 @@ bool LLTexGlobalColor::setInfo(LLTexGlobalColorInfo *info)
 	for (LLTexLayerParamColorInfo* color_info : mInfo->mParamColorInfoList)
 	{
 		LLTexParamGlobalColor* param_color = new LLTexParamGlobalColor(this);
-		if (!param_color->setInfo(color_info, TRUE))
+		if (!param_color->setInfo(color_info, true))
 		{
 			mInfo = NULL;
 			return false;
diff --git a/indra/llappearance/lltexlayer.cpp b/indra/llappearance/lltexlayer.cpp
index 73ce5257e5..15a031f90c 100644
--- a/indra/llappearance/lltexlayer.cpp
+++ b/indra/llappearance/lltexlayer.cpp
@@ -60,16 +60,16 @@ public:
 	~LLTexLayerInfo();
 
 	bool parseXml(LLXmlTreeNode* node);
-	BOOL createVisualParams(LLAvatarAppearance *appearance);
-	BOOL isUserSettable() { return mLocalTexture != -1;	}
+	bool createVisualParams(LLAvatarAppearance *appearance);
+	bool isUserSettable() { return mLocalTexture != -1;	}
 	S32  getLocalTexture() const { return mLocalTexture; }
-	BOOL getOnlyAlpha() const { return mUseLocalTextureAlphaOnly; }
+	bool getOnlyAlpha() const { return mUseLocalTextureAlphaOnly; }
 	std::string getName() const { return mName;	}
 
 private:
 	std::string				mName;
 	
-	BOOL					mWriteAllChannels; // Don't use masking.  Just write RGBA into buffer,
+	bool					mWriteAllChannels; // Don't use masking.  Just write RGBA into buffer,
 	LLTexLayerInterface::ERenderPass mRenderPass;
 
 	std::string				mGlobalColor;
@@ -77,11 +77,11 @@ private:
 
 	S32						mLocalTexture;
 	std::string				mStaticImageFileName;
-	BOOL					mStaticImageIsMask;
-	BOOL					mUseLocalTextureAlphaOnly; // Ignore RGB channels from the input texture.  Use alpha as a mask
-	BOOL					mIsVisibilityMask;
+	bool					mStaticImageIsMask;
+	bool					mUseLocalTextureAlphaOnly; // Ignore RGB channels from the input texture.  Use alpha as a mask
+	bool					mIsVisibilityMask;
 
-	typedef std::vector< std::pair< std::string,BOOL > > morph_name_list_t;
+	typedef std::vector< std::pair< std::string,bool > > morph_name_list_t;
 	morph_name_list_t		    mMorphNameList;
 	param_color_info_list_t		mParamColorInfoList;
 	param_alpha_info_list_t		mParamAlphaInfoList;
@@ -130,17 +130,17 @@ void LLTexLayerSetBuffer::preRenderTexLayerSet()
 }
 
 // virtual
-void LLTexLayerSetBuffer::postRenderTexLayerSet(BOOL success)
+void LLTexLayerSetBuffer::postRenderTexLayerSet(bool success)
 {
 	popProjection();
 }
 
-BOOL LLTexLayerSetBuffer::renderTexLayerSet(LLRenderTarget* bound_target)
+bool LLTexLayerSetBuffer::renderTexLayerSet(LLRenderTarget* bound_target)
 {
 	// Default color mask for tex layer render
 	gGL.setColorMask(true, true);
 
-	BOOL success = TRUE;
+	bool success = true;
 	
 	gAlphaMaskProgram.bind();
 	gAlphaMaskProgram.setMinimumAlpha(0.004f);
@@ -175,7 +175,7 @@ LLTexLayerSetInfo::LLTexLayerSetInfo() :
 	mBodyRegion( "" ),
 	mWidth( 512 ),
 	mHeight( 512 ),
-	mClearAlpha( TRUE )
+	mClearAlpha( true )
 {
 }
 
@@ -252,11 +252,11 @@ void LLTexLayerSetInfo::createVisualParams(LLAvatarAppearance *appearance)
 // An ordered set of texture layers that get composited into a single texture.
 //-----------------------------------------------------------------------------
 
-BOOL LLTexLayerSet::sHasCaches = FALSE;
+bool LLTexLayerSet::sHasCaches = false;
 
 LLTexLayerSet::LLTexLayerSet(LLAvatarAppearance* const appearance) :
 	mAvatarAppearance( appearance ),
-	mIsVisible( TRUE ),
+	mIsVisible( true ),
 	mBakedTexIndex(LLAvatarAppearanceDefines::BAKED_HEAD),
 	mInfo( NULL )
 {
@@ -277,7 +277,7 @@ LLTexLayerSet::~LLTexLayerSet()
 // setInfo
 //-----------------------------------------------------------------------------
 
-BOOL LLTexLayerSet::setInfo(const LLTexLayerSetInfo *info)
+bool LLTexLayerSet::setInfo(const LLTexLayerSetInfo *info)
 {
 	llassert(mInfo == NULL);
 	mInfo = info;
@@ -323,7 +323,7 @@ BOOL LLTexLayerSet::setInfo(const LLTexLayerSetInfo *info)
 // parseData
 //-----------------------------------------------------------------------------
 
-BOOL LLTexLayerSet::parseData(LLXmlTreeNode* node)
+bool LLTexLayerSet::parseData(LLXmlTreeNode* node)
 {
 	LLTexLayerSetInfo *info = new LLTexLayerSetInfo;
 
@@ -354,10 +354,10 @@ void LLTexLayerSet::deleteCaches()
 }
 
 
-BOOL LLTexLayerSet::render( S32 x, S32 y, S32 width, S32 height, LLRenderTarget* bound_target )
+bool LLTexLayerSet::render( S32 x, S32 y, S32 width, S32 height, LLRenderTarget* bound_target )
 {
-	BOOL success = TRUE;
-	mIsVisible = TRUE;
+	bool success = true;
+	mIsVisible = true;
 
 	if (mMaskLayerList.size() > 0)
 	{
@@ -365,7 +365,7 @@ BOOL LLTexLayerSet::render( S32 x, S32 y, S32 width, S32 height, LLRenderTarget*
 		{
 			if (layer->isInvisibleAlphaMask())
 			{
-				mIsVisible = FALSE;
+				mIsVisible = false;
 			}
 		}
 	}
@@ -425,8 +425,8 @@ BOOL LLTexLayerSet::render( S32 x, S32 y, S32 width, S32 height, LLRenderTarget*
 }
 
 
-BOOL LLTexLayerSet::isBodyRegion(const std::string& region) const 
-{ 
+bool LLTexLayerSet::isBodyRegion(const std::string& region) const
+{
 	return mInfo->mBodyRegion == region; 
 }
 
@@ -484,7 +484,7 @@ void LLTexLayerSet::renderAlphaMaskTextures(S32 x, S32 y, S32 width, S32 height,
 	{
 		gGL.flush();
 		{
-			LLGLTexture* tex = LLTexLayerStaticImageList::getInstance()->getTexture(info->mStaticAlphaFileName, TRUE);
+			LLGLTexture* tex = LLTexLayerStaticImageList::getInstance()->getTexture(info->mStaticAlphaFileName, true);
 			if( tex )
 			{
 				LLGLSUIDefault gls_ui;
@@ -533,7 +533,7 @@ void LLTexLayerSet::applyMorphMask(const U8* tex_data, S32 width, S32 height, S3
 	mAvatarAppearance->applyMorphMask(tex_data, width, height, num_components, mBakedTexIndex);
 }
 
-BOOL LLTexLayerSet::isMorphValid() const
+bool LLTexLayerSet::isMorphValid() const
 {
 	for(const LLTexLayerInterface* layer : mLayerList)
 	{
@@ -561,13 +561,13 @@ void LLTexLayerSet::invalidateMorphMasks()
 // LLTexLayerInfo
 //-----------------------------------------------------------------------------
 LLTexLayerInfo::LLTexLayerInfo() :
-	mWriteAllChannels( FALSE ),
+	mWriteAllChannels( false ),
 	mRenderPass(LLTexLayer::RP_COLOR),
 	mFixedColor( 0.f, 0.f, 0.f, 0.f ),
 	mLocalTexture( -1 ),
-	mStaticImageIsMask( FALSE ),
-	mUseLocalTextureAlphaOnly(FALSE),
-	mIsVisibilityMask(FALSE)
+	mStaticImageIsMask( false ),
+	mUseLocalTextureAlphaOnly(false),
+	mIsVisibilityMask(false)
 {
 }
 
@@ -609,7 +609,7 @@ bool LLTexLayerInfo::parseXml(LLXmlTreeNode* node)
 	node->getFastAttributeString( global_color_string, mGlobalColor );
 
 	// Visibility mask (optional)
-	BOOL is_visibility;
+	bool is_visibility;
 	static LLStdStringHandle visibility_mask_string = LLXmlTree::addAttributeString("visibility_mask");
 	if (node->getFastAttributeBOOL(visibility_mask_string, is_visibility))
 	{
@@ -675,10 +675,10 @@ bool LLTexLayerInfo::parseXml(LLXmlTreeNode* node)
 		static LLStdStringHandle morph_name_string = LLXmlTree::addAttributeString("morph_name");
 		if (maskNode->getFastAttributeString(morph_name_string, morph_name))
 		{
-			BOOL invert = FALSE;
+			bool invert = false;
 			static LLStdStringHandle invert_string = LLXmlTree::addAttributeString("invert");
 			maskNode->getFastAttributeBOOL(invert_string, invert);			
-			mMorphNameList.push_back(std::pair<std::string,BOOL>(morph_name,invert));
+			mMorphNameList.push_back(std::pair<std::string,bool>(morph_name,invert));
 		}
 	}
 
@@ -714,28 +714,28 @@ bool LLTexLayerInfo::parseXml(LLXmlTreeNode* node)
 	return true;
 }
 
-BOOL LLTexLayerInfo::createVisualParams(LLAvatarAppearance *appearance)
+bool LLTexLayerInfo::createVisualParams(LLAvatarAppearance *appearance)
 {
-	BOOL success = true;
+	bool success = true;
 	for (LLTexLayerParamColorInfo* color_info : mParamColorInfoList)
 	{
 		LLTexLayerParamColor* param_color = new LLTexLayerParamColor(appearance);
-		if (!param_color->setInfo(color_info, TRUE))
+		if (!param_color->setInfo(color_info, true))
 		{
 			LL_WARNS() << "NULL TexLayer Color Param could not be added to visual param list. Deleting." << LL_ENDL;
 			delete param_color;
-			success = FALSE;
+			success = false;
 		}
 	}
 
 	for (LLTexLayerParamAlphaInfo* alpha_info : mParamAlphaInfoList)
 	{
 		LLTexLayerParamAlpha* param_alpha = new LLTexLayerParamAlpha(appearance);
-		if (!param_alpha->setInfo(alpha_info, TRUE))
+		if (!param_alpha->setInfo(alpha_info, true))
 		{
 			LL_WARNS() << "NULL TexLayer Alpha Param could not be added to visual param list. Deleting." << LL_ENDL;
 			delete param_alpha;
-			success = FALSE;
+			success = false;
 		}
 	}
 
@@ -744,9 +744,9 @@ BOOL LLTexLayerInfo::createVisualParams(LLAvatarAppearance *appearance)
 
 LLTexLayerInterface::LLTexLayerInterface(LLTexLayerSet* const layer_set):
 	mTexLayerSet( layer_set ),
-	mMorphMasksValid( FALSE ),
+	mMorphMasksValid( false ),
 	mInfo(NULL),
-	mHasMorph(FALSE)
+	mHasMorph(false)
 {
 }
 
@@ -760,7 +760,7 @@ LLTexLayerInterface::LLTexLayerInterface(const LLTexLayerInterface &layer, LLWea
 	mHasMorph = layer.mHasMorph;
 }
 
-BOOL LLTexLayerInterface::setInfo(const LLTexLayerInfo *info, LLWearable* wearable  ) // This sets mInfo and calls initialization functions
+bool LLTexLayerInterface::setInfo(const LLTexLayerInfo *info, LLWearable* wearable  ) // This sets mInfo and calls initialization functions
 {
 	// setInfo should only be called once. Code is not robust enough to handle redefinition of a texlayer.
 	// Not a critical warning, but could be useful for debugging later issues. -Nyx
@@ -778,7 +778,7 @@ BOOL LLTexLayerInterface::setInfo(const LLTexLayerInfo *info, LLWearable* wearab
 		if (!wearable)
 			{
 				param_color = new LLTexLayerParamColor(this);
-				if (!param_color->setInfo(color_info, TRUE))
+				if (!param_color->setInfo(color_info, true))
 				{
 					mInfo = NULL;
 					return false;
@@ -803,7 +803,7 @@ BOOL LLTexLayerInterface::setInfo(const LLTexLayerInfo *info, LLWearable* wearab
 			if (!wearable)
 			{
 				param_alpha = new LLTexLayerParamAlpha( this );
-				if (!param_alpha->setInfo(alpha_info, TRUE))
+				if (!param_alpha->setInfo(alpha_info, true))
 				{
 					mInfo = NULL;
 					return false;
@@ -893,14 +893,14 @@ const std::string& LLTexLayerInterface::getGlobalColor() const
 	return mInfo->mGlobalColor; 
 }
 
-BOOL LLTexLayerInterface::isVisibilityMask() const
+bool LLTexLayerInterface::isVisibilityMask() const
 {
 	return mInfo->mIsVisibilityMask;
 }
 
 void LLTexLayerInterface::invalidateMorphMasks()
 {
-	mMorphMasksValid = FALSE;
+	mMorphMasksValid = false;
 }
 
 LLViewerVisualParam* LLTexLayerInterface::getVisualParamPtr(S32 index) const
@@ -980,7 +980,7 @@ void LLTexLayer::asLLSD(LLSD& sd) const
 // setInfo
 //-----------------------------------------------------------------------------
 
-BOOL LLTexLayer::setInfo(const LLTexLayerInfo* info, LLWearable* wearable  )
+bool LLTexLayer::setInfo(const LLTexLayerInfo* info, LLWearable* wearable  )
 {
 	return LLTexLayerInterface::setInfo(info, wearable);
 }
@@ -1020,14 +1020,14 @@ void LLTexLayer::calculateTexLayerColor(const param_color_list_t &param_list, LL
 	}
 }
 
-BOOL LLTexLayer::render(S32 x, S32 y, S32 width, S32 height, LLRenderTarget* bound_target)
+bool LLTexLayer::render(S32 x, S32 y, S32 width, S32 height, LLRenderTarget* bound_target)
 {
 	// *TODO: Is this correct?
 	//gPipeline.disableLights();
 	stop_glerror();
 
 	LLColor4 net_color;
-	BOOL color_specified = findNetColor(&net_color);
+	bool color_specified = findNetColor(&net_color);
 	
 	if (mTexLayerSet->getAvatarAppearance()->mIsDummy)
 	{
@@ -1035,7 +1035,7 @@ BOOL LLTexLayer::render(S32 x, S32 y, S32 width, S32 height, LLRenderTarget* bou
 		net_color = LLAvatarAppearance::getDummyColor();
 	}
 
-	BOOL success = TRUE;
+	bool success = true;
 	
 	// If you can't see the layer, don't render it.
 	if( is_approx_zero( net_color.mV[VW] ) )
@@ -1043,7 +1043,7 @@ BOOL LLTexLayer::render(S32 x, S32 y, S32 width, S32 height, LLRenderTarget* bou
 		return success;
 	}
 
-	BOOL alpha_mask_specified = FALSE;
+	bool alpha_mask_specified = false;
 	param_alpha_list_t::const_iterator iter = mParamAlphaList.begin();
 	if( iter != mParamAlphaList.end() )
 	{
@@ -1051,7 +1051,7 @@ BOOL LLTexLayer::render(S32 x, S32 y, S32 width, S32 height, LLRenderTarget* bou
 		// However, we can't do this optimization if we have morph masks that need updating.
 /*		if (!mHasMorph)
 		{
-			BOOL skip_layer = TRUE;
+			bool skip_layer = true;
 
 			while( iter != mParamAlphaList.end() )
 			{
@@ -1059,7 +1059,7 @@ BOOL LLTexLayer::render(S32 x, S32 y, S32 width, S32 height, LLRenderTarget* bou
 		
 				if( !param->getSkip() )
 				{
-					skip_layer = FALSE;
+					skip_layer = false;
 					break;
 				}
 
@@ -1074,7 +1074,7 @@ BOOL LLTexLayer::render(S32 x, S32 y, S32 width, S32 height, LLRenderTarget* bou
 
 		const bool force_render = true;
 		renderMorphMasks(x, y, width, height, net_color, bound_target, force_render);
-		alpha_mask_specified = TRUE;
+		alpha_mask_specified = true;
 		gGL.flush();
 		gGL.blendFunc(LLRender::BF_DEST_ALPHA, LLRender::BF_ONE_MINUS_DEST_ALPHA);
 	}
@@ -1115,7 +1115,7 @@ BOOL LLTexLayer::render(S32 x, S32 y, S32 width, S32 height, LLRenderTarget* bou
 					
 					LLTexUnit::eTextureAddressMode old_mode = tex->getAddressMode();
 					
-					gGL.getTexUnit(0)->bind(tex, TRUE);
+					gGL.getTexUnit(0)->bind(tex, true);
 					gGL.getTexUnit(0)->setTextureAddressMode(LLTexUnit::TAM_CLAMP);
 
 					gl_rect_2d_simple_tex( width, height );
@@ -1130,7 +1130,7 @@ BOOL LLTexLayer::render(S32 x, S32 y, S32 width, S32 height, LLRenderTarget* bou
 			}
 //			else
 //			{
-//				success = FALSE;
+//				success = false;
 //			}
 		}
 	}
@@ -1141,13 +1141,13 @@ BOOL LLTexLayer::render(S32 x, S32 y, S32 width, S32 height, LLRenderTarget* bou
 			LLGLTexture* tex = LLTexLayerStaticImageList::getInstance()->getTexture(getInfo()->mStaticImageFileName, getInfo()->mStaticImageIsMask);
 			if( tex )
 			{
-				gGL.getTexUnit(0)->bind(tex, TRUE);
+				gGL.getTexUnit(0)->bind(tex, true);
 				gl_rect_2d_simple_tex( width, height );
 				gGL.getTexUnit(0)->unbind(LLTexUnit::TT_TEXTURE);
 			}
 			else
 			{
-				success = FALSE;
+				success = false;
 			}
 		}
 	}
@@ -1199,7 +1199,7 @@ const U8*	LLTexLayer::getAlphaData() const
 	return (iter2 == mAlphaCache.end()) ? 0 : iter2->second;
 }
 
-BOOL LLTexLayer::findNetColor(LLColor4* net_color) const
+bool LLTexLayer::findNetColor(LLColor4* net_color) const
 {
 	// Color is either:
 	//	* one or more color parameters (weighted colors)  (which may make use of a global color or fixed color)
@@ -1243,9 +1243,9 @@ BOOL LLTexLayer::findNetColor(LLColor4* net_color) const
 	return false; // No need to draw a separate colored polygon
 }
 
-BOOL LLTexLayer::blendAlphaTexture(S32 x, S32 y, S32 width, S32 height)
+bool LLTexLayer::blendAlphaTexture(S32 x, S32 y, S32 width, S32 height)
 {
-	BOOL success = true;
+	bool success = true;
 
 	gGL.flush();
 	
@@ -1255,14 +1255,14 @@ BOOL LLTexLayer::blendAlphaTexture(S32 x, S32 y, S32 width, S32 height)
 		if( tex )
 		{
 			gAlphaMaskProgram.setMinimumAlpha(0.f);
-			gGL.getTexUnit(0)->bind(tex, TRUE);
+			gGL.getTexUnit(0)->bind(tex, true);
 			gl_rect_2d_simple_tex( width, height );
 			gGL.getTexUnit(0)->unbind(LLTexUnit::TT_TEXTURE);
 			gAlphaMaskProgram.setMinimumAlpha(0.004f);
 		}
 		else
 		{
-			success = FALSE;
+			success = false;
 		}
 	}
 	else
@@ -1297,7 +1297,7 @@ void LLTexLayer::renderMorphMasks(S32 x, S32 y, S32 width, S32 height, const LLC
 		return;
 	}
     LL_PROFILE_ZONE_SCOPED;
-	BOOL success = TRUE;
+	bool success = true;
 
 	llassert( !mParamAlphaList.empty() );
 
@@ -1342,7 +1342,7 @@ void LLTexLayer::renderMorphMasks(S32 x, S32 y, S32 width, S32 height, const LLC
 		{
 			LLTexUnit::eTextureAddressMode old_mode = tex->getAddressMode();
 			
-			gGL.getTexUnit(0)->bind(tex, TRUE);
+			gGL.getTexUnit(0)->bind(tex, true);
 			gGL.getTexUnit(0)->setTextureAddressMode(LLTexUnit::TAM_CLAMP);
 
 			gl_rect_2d_simple_tex( width, height );
@@ -1359,7 +1359,7 @@ void LLTexLayer::renderMorphMasks(S32 x, S32 y, S32 width, S32 height, const LLC
 		{
 			if(	(tex->getComponents() == 4) || (tex->getComponents() == 1) )
 			{
-				gGL.getTexUnit(0)->bind(tex, TRUE);
+				gGL.getTexUnit(0)->bind(tex, true);
 				gl_rect_2d_simple_tex( width, height );
 				gGL.getTexUnit(0)->unbind(LLTexUnit::TT_TEXTURE);
 			}
@@ -1480,7 +1480,7 @@ void LLTexLayer::renderMorphMasks(S32 x, S32 y, S32 width, S32 height, const LLC
 		
 		getTexLayerSet()->getAvatarAppearance()->dirtyMesh();
 
-		mMorphMasksValid = TRUE;
+		mMorphMasksValid = true;
 		getTexLayerSet()->applyMorphMask(alpha_data, width, height, 1);
 	}
 }
@@ -1513,7 +1513,7 @@ void LLTexLayer::addAlphaMask(U8 *data, S32 originX, S32 originY, S32 width, S32
 	}
 }
 
-/*virtual*/ BOOL LLTexLayer::isInvisibleAlphaMask() const
+/*virtual*/ bool LLTexLayer::isInvisibleAlphaMask() const
 {
 	if (mLocalTextureObject)
 	{
@@ -1582,7 +1582,7 @@ LLTexLayerTemplate::~LLTexLayerTemplate()
 // setInfo
 //-----------------------------------------------------------------------------
 
-/*virtual*/ BOOL LLTexLayerTemplate::setInfo(const LLTexLayerInfo* info, LLWearable* wearable  )
+/*virtual*/ bool LLTexLayerTemplate::setInfo(const LLTexLayerInfo* info, LLWearable* wearable  )
 {
 	return LLTexLayerInterface::setInfo(info, wearable);
 }
@@ -1631,14 +1631,14 @@ LLTexLayer* LLTexLayerTemplate::getLayer(U32 i) const
 	return layer;
 }
 
-/*virtual*/ BOOL LLTexLayerTemplate::render(S32 x, S32 y, S32 width, S32 height, LLRenderTarget* bound_target)
+/*virtual*/ bool LLTexLayerTemplate::render(S32 x, S32 y, S32 width, S32 height, LLRenderTarget* bound_target)
 {
 	if(!mInfo)
 	{
-		return FALSE ;
+		return false ;
 	}
 
-	BOOL success = TRUE;
+	bool success = true;
 	updateWearableCache();
 	for (LLWearable* wearable : mWearableCache)
 	{
@@ -1663,9 +1663,9 @@ LLTexLayer* LLTexLayerTemplate::getLayer(U32 i) const
 	return success;
 }
 
-/*virtual*/ BOOL LLTexLayerTemplate::blendAlphaTexture( S32 x, S32 y, S32 width, S32 height) // Multiplies a single alpha texture against the frame buffer
+/*virtual*/ bool LLTexLayerTemplate::blendAlphaTexture( S32 x, S32 y, S32 width, S32 height) // Multiplies a single alpha texture against the frame buffer
 {
-	BOOL success = TRUE;
+	bool success = true;
 	U32 num_wearables = updateWearableCache();
 	for (U32 i = 0; i < num_wearables; i++)
 	{
@@ -1689,8 +1689,8 @@ LLTexLayer* LLTexLayerTemplate::getLayer(U32 i) const
 	}
 }
 
-/*virtual*/ void LLTexLayerTemplate::setHasMorph(BOOL newval)
-{ 
+/*virtual*/ void LLTexLayerTemplate::setHasMorph(bool newval)
+{
 	mHasMorph = newval;
 	U32 num_wearables = updateWearableCache();
 	for (U32 i = 0; i < num_wearables; i++)
@@ -1716,7 +1716,7 @@ LLTexLayer* LLTexLayerTemplate::getLayer(U32 i) const
 	}
 }
 
-/*virtual*/ BOOL LLTexLayerTemplate::isInvisibleAlphaMask() const
+/*virtual*/ bool LLTexLayerTemplate::isInvisibleAlphaMask() const
 {
 	U32 num_wearables = updateWearableCache();
 	for (U32 i = 0; i < num_wearables; i++)
@@ -1853,7 +1853,7 @@ LLImageTGA* LLTexLayerStaticImageList::getImageTGA(const std::string& file_name)
 
 // Returns a GL Image (without a backing ImageRaw) that contains the decoded data from a tga file named file_name.
 // Caches the result to speed identical subsequent requests.
-LLGLTexture* LLTexLayerStaticImageList::getTexture(const std::string& file_name, BOOL is_mask)
+LLGLTexture* LLTexLayerStaticImageList::getTexture(const std::string& file_name, bool is_mask)
 {
     LL_PROFILE_ZONE_SCOPED;
 	LLPointer<LLGLTexture> tex;
@@ -1867,7 +1867,7 @@ LLGLTexture* LLTexLayerStaticImageList::getTexture(const std::string& file_name,
 	else
 	{
 		llassert(gTextureManagerBridgep);
-		tex = gTextureManagerBridgep->getLocalTexture( FALSE );
+		tex = gTextureManagerBridgep->getLocalTexture( false );
 		LLPointer<LLImageRaw> image_raw = new LLImageRaw;
 		if( loadImageRaw( file_name, image_raw ) )
 		{
@@ -1883,7 +1883,7 @@ LLGLTexture* LLTexLayerStaticImageList::getTexture(const std::string& file_name,
 
 				image_raw->copyUnscaledAlphaMask(alpha_image_raw, LLColor4U::black);
 			}
-			tex->createGLTexture(0, image_raw, 0, TRUE, LLGLTexture::LOCAL);
+			tex->createGLTexture(0, image_raw, 0, true, LLGLTexture::LOCAL);
 
 			gGL.getTexUnit(0)->bind(tex);
 			tex->setAddressMode(LLTexUnit::TAM_CLAMP);
@@ -1901,11 +1901,11 @@ LLGLTexture* LLTexLayerStaticImageList::getTexture(const std::string& file_name,
 }
 
 // Reads a .tga file, decodes it, and puts the decoded data in image_raw.
-// Returns TRUE if successful.
-BOOL LLTexLayerStaticImageList::loadImageRaw(const std::string& file_name, LLImageRaw* image_raw)
+// Returns true if successful.
+bool LLTexLayerStaticImageList::loadImageRaw(const std::string& file_name, LLImageRaw* image_raw)
 {
     LL_PROFILE_ZONE_SCOPED;
-	BOOL success = FALSE;
+	bool success = false;
 	std::string path;
 	path = gDirUtilp->getExpandedFilename(LL_PATH_CHARACTER,file_name);
 	LLPointer<LLImageTGA> image_tga = new LLImageTGA( path );
diff --git a/indra/llappearance/lltexlayer.h b/indra/llappearance/lltexlayer.h
index 2cca2b6b12..bc55db01fc 100644
--- a/indra/llappearance/lltexlayer.h
+++ b/indra/llappearance/lltexlayer.h
@@ -65,13 +65,13 @@ public:
 	LLTexLayerInterface(const LLTexLayerInterface &layer, LLWearable *wearable);
 	virtual ~LLTexLayerInterface() {}
 
-	virtual BOOL			render(S32 x, S32 y, S32 width, S32 height, LLRenderTarget* bound_target) = 0;
+	virtual bool			render(S32 x, S32 y, S32 width, S32 height, LLRenderTarget* bound_target) = 0;
 	virtual void			deleteCaches() = 0;
-	virtual BOOL			blendAlphaTexture(S32 x, S32 y, S32 width, S32 height) = 0;
-	virtual BOOL			isInvisibleAlphaMask() const = 0;
+	virtual bool			blendAlphaTexture(S32 x, S32 y, S32 width, S32 height) = 0;
+	virtual bool			isInvisibleAlphaMask() const = 0;
 
 	const LLTexLayerInfo* 	getInfo() const 			{ return mInfo; }
-	virtual BOOL			setInfo(const LLTexLayerInfo *info, LLWearable* wearable); // sets mInfo, calls initialization functions
+	virtual bool			setInfo(const LLTexLayerInfo *info, LLWearable* wearable); // sets mInfo, calls initialization functions
 	LLWearableType::EType	getWearableType() const;
 	LLAvatarAppearanceDefines::ETextureIndex	getLocalTextureIndex() const;
 
@@ -80,16 +80,16 @@ public:
 	LLTexLayerSet* const 	getTexLayerSet() 			{ return mTexLayerSet; }
 
 	void					invalidateMorphMasks();
-	virtual void			setHasMorph(BOOL newval) 	{ mHasMorph = newval; }
-	BOOL					hasMorph() const			{ return mHasMorph; }
-	BOOL					isMorphValid() const		{ return mMorphMasksValid; }
+	virtual void			setHasMorph(bool newval) 	{ mHasMorph = newval; }
+	bool					hasMorph() const			{ return mHasMorph; }
+	bool					isMorphValid() const		{ return mMorphMasksValid; }
 
 	void					requestUpdate();
 	virtual void			gatherAlphaMasks(U8 *data, S32 originX, S32 originY, S32 width, S32 height, LLRenderTarget* bound_target) = 0;
-	BOOL					hasAlphaParams() const 		{ return !mParamAlphaList.empty(); }
+	bool					hasAlphaParams() const 		{ return !mParamAlphaList.empty(); }
 
 	ERenderPass				getRenderPass() const;
-	BOOL					isVisibilityMask() const;
+	bool					isVisibilityMask() const;
 
 	virtual void			asLLSD(LLSD& sd) const {}
 
@@ -100,8 +100,8 @@ protected:
 protected:
 	LLTexLayerSet* const	mTexLayerSet;
 	const LLTexLayerInfo*	mInfo;
-	BOOL					mMorphMasksValid;
-	BOOL					mHasMorph;
+	bool					mMorphMasksValid;
+	bool					mHasMorph;
 
 	// Layers can have either mParamColorList, mGlobalColor, or mFixedColor.  They are looked for in that order.
 	param_color_list_t		mParamColorList;
@@ -121,13 +121,13 @@ public:
 	LLTexLayerTemplate(LLTexLayerSet* const layer_set, LLAvatarAppearance* const appearance);
 	LLTexLayerTemplate(const LLTexLayerTemplate &layer);
 	/*virtual*/ ~LLTexLayerTemplate();
-	/*virtual*/ BOOL		render(S32 x, S32 y, S32 width, S32 height, LLRenderTarget* bound_target);
-	/*virtual*/ BOOL		setInfo(const LLTexLayerInfo *info, LLWearable* wearable); // This sets mInfo and calls initialization functions
-	/*virtual*/ BOOL		blendAlphaTexture(S32 x, S32 y, S32 width, S32 height); // Multiplies a single alpha texture against the frame buffer
+	/*virtual*/ bool		render(S32 x, S32 y, S32 width, S32 height, LLRenderTarget* bound_target);
+	/*virtual*/ bool		setInfo(const LLTexLayerInfo *info, LLWearable* wearable); // This sets mInfo and calls initialization functions
+	/*virtual*/ bool		blendAlphaTexture(S32 x, S32 y, S32 width, S32 height); // Multiplies a single alpha texture against the frame buffer
 	/*virtual*/ void		gatherAlphaMasks(U8 *data, S32 originX, S32 originY, S32 width, S32 height, LLRenderTarget* bound_target);
-	/*virtual*/ void		setHasMorph(BOOL newval);
+	/*virtual*/ void		setHasMorph(bool newval);
 	/*virtual*/ void		deleteCaches();
-	/*virtual*/ BOOL		isInvisibleAlphaMask() const;
+	/*virtual*/ bool		isInvisibleAlphaMask() const;
 protected:
 	U32 					updateWearableCache() const;
 	LLTexLayer* 			getLayer(U32 i) const;
@@ -151,18 +151,18 @@ public:
 	LLTexLayer(const LLTexLayerTemplate &layer_template, LLLocalTextureObject *lto, LLWearable *wearable);
 	/*virtual*/ ~LLTexLayer();
 
-	/*virtual*/ BOOL		setInfo(const LLTexLayerInfo *info, LLWearable* wearable); // This sets mInfo and calls initialization functions
-	/*virtual*/ BOOL		render(S32 x, S32 y, S32 width, S32 height, LLRenderTarget* bound_target);
+	/*virtual*/ bool		setInfo(const LLTexLayerInfo *info, LLWearable* wearable); // This sets mInfo and calls initialization functions
+	/*virtual*/ bool		render(S32 x, S32 y, S32 width, S32 height, LLRenderTarget* bound_target);
 
 	/*virtual*/ void		deleteCaches();
 	const U8*				getAlphaData() const;
 
-	BOOL					findNetColor(LLColor4* color) const;
-	/*virtual*/ BOOL		blendAlphaTexture(S32 x, S32 y, S32 width, S32 height); // Multiplies a single alpha texture against the frame buffer
+	bool					findNetColor(LLColor4* color) const;
+	/*virtual*/ bool		blendAlphaTexture(S32 x, S32 y, S32 width, S32 height); // Multiplies a single alpha texture against the frame buffer
 	/*virtual*/ void		gatherAlphaMasks(U8 *data, S32 originX, S32 originY, S32 width, S32 height, LLRenderTarget* bound_target);
 	void					renderMorphMasks(S32 x, S32 y, S32 width, S32 height, const LLColor4 &layer_color, LLRenderTarget* bound_target, bool force_render);
 	void					addAlphaMask(U8 *data, S32 originX, S32 originY, S32 width, S32 height, LLRenderTarget* bound_target);
-	/*virtual*/ BOOL		isInvisibleAlphaMask() const;
+	/*virtual*/ bool		isInvisibleAlphaMask() const;
 
 	void					setLTO(LLLocalTextureObject *lto) 	{ mLocalTextureObject = lto; }
 	LLLocalTextureObject* 	getLTO() 							{ return mLocalTextureObject; }
@@ -197,14 +197,14 @@ public:
 	void						gatherMorphMaskAlpha(U8 *data, S32 origin_x, S32 origin_y, S32 width, S32 height, LLRenderTarget* bound_target);
 
 	const LLTexLayerSetInfo* 	getInfo() const 			{ return mInfo; }
-	BOOL						setInfo(const LLTexLayerSetInfo *info); // This sets mInfo and calls initialization functions
+	bool						setInfo(const LLTexLayerSetInfo *info); // This sets mInfo and calls initialization functions
 
-	BOOL						render(S32 x, S32 y, S32 width, S32 height, LLRenderTarget* bound_target = nullptr);
+	bool						render(S32 x, S32 y, S32 width, S32 height, LLRenderTarget* bound_target = nullptr);
 	void						renderAlphaMaskTextures(S32 x, S32 y, S32 width, S32 height, LLRenderTarget* bound_target = nullptr, bool forceClear = false);
 
-	BOOL						isBodyRegion(const std::string& region) const;
+	bool						isBodyRegion(const std::string& region) const;
 	void						applyMorphMask(const U8* tex_data, S32 width, S32 height, S32 num_components);
-	BOOL						isMorphValid() const;
+	bool						isMorphValid() const;
 	virtual void				requestUpdate() = 0;
 	void						invalidateMorphMasks();
 	void						deleteCaches();
@@ -213,12 +213,12 @@ public:
 	
 	LLAvatarAppearance*			getAvatarAppearance()	const		{ return mAvatarAppearance; }
 	const std::string			getBodyRegionName() const;
-	BOOL						hasComposite() const 		{ return (mComposite.notNull()); }
+	bool						hasComposite() const 		{ return (mComposite.notNull()); }
 	LLAvatarAppearanceDefines::EBakedTextureIndex getBakedTexIndex() const { return mBakedTexIndex; }
 	void						setBakedTexIndex(LLAvatarAppearanceDefines::EBakedTextureIndex index) { mBakedTexIndex = index; }
-	BOOL						isVisible() const 			{ return mIsVisible; }
+	bool						isVisible() const 			{ return mIsVisible; }
 
-	static BOOL					sHasCaches;
+	static bool					sHasCaches;
 
 protected:
 	typedef std::vector<LLTexLayerInterface *> layer_list_t;
@@ -226,7 +226,7 @@ protected:
 	layer_list_t				mMaskLayerList;
 	LLPointer<LLTexLayerSetBuffer>	mComposite;
 	LLAvatarAppearance*	const	mAvatarAppearance; // note: backlink only; don't make this an LLPointer.
-	BOOL						mIsVisible;
+	bool						mIsVisible;
 
 	LLAvatarAppearanceDefines::EBakedTextureIndex mBakedTexIndex;
 	const LLTexLayerSetInfo* 	mInfo;
@@ -252,7 +252,7 @@ protected:
 	S32						mWidth;
 	S32						mHeight;
 	std::string				mStaticAlphaFileName;
-	BOOL					mClearAlpha; // Set alpha to 1 for this layerset (if there is no mStaticAlphaFileName)
+	bool					mClearAlpha; // Set alpha to 1 for this layerset (if there is no mStaticAlphaFileName)
 	typedef std::vector<LLTexLayerInfo*> layer_info_list_t;
 	layer_info_list_t		mLayerInfoList;
 };
@@ -274,13 +274,13 @@ protected:
 	void					pushProjection() const;
 	void					popProjection() const;
 	virtual void			preRenderTexLayerSet();
-	virtual void			midRenderTexLayerSet(BOOL success) {}
-	virtual void			postRenderTexLayerSet(BOOL success);
+	virtual void			midRenderTexLayerSet(bool success) {}
+	virtual void			postRenderTexLayerSet(bool success);
 	virtual S32				getCompositeOriginX() const = 0;
 	virtual S32				getCompositeOriginY() const = 0;
 	virtual S32				getCompositeWidth() const = 0;
 	virtual S32				getCompositeHeight() const = 0;
-	BOOL					renderTexLayerSet(LLRenderTarget* bound_target);
+	bool					renderTexLayerSet(LLRenderTarget* bound_target);
 
 	LLTexLayerSet* const	mTexLayerSet;
 };
@@ -294,12 +294,12 @@ class LLTexLayerStaticImageList : public LLSingleton<LLTexLayerStaticImageList>
 	LLSINGLETON(LLTexLayerStaticImageList);
 	~LLTexLayerStaticImageList();
 public:
-	LLGLTexture*		getTexture(const std::string& file_name, BOOL is_mask);
+	LLGLTexture*		getTexture(const std::string& file_name, bool is_mask);
 	LLImageTGA*			getImageTGA(const std::string& file_name);
 	void				deleteCachedImages();
 	void				dumpByteCount() const;
 protected:
-	BOOL				loadImageRaw(const std::string& file_name, LLImageRaw* image_raw);
+	bool				loadImageRaw(const std::string& file_name, LLImageRaw* image_raw);
 private:
 	LLStringTable 		mImageNames;
 	typedef std::map<const char*, LLPointer<LLGLTexture> > texture_map_t;
diff --git a/indra/llappearance/lltexlayerparams.cpp b/indra/llappearance/lltexlayerparams.cpp
index 4cfbdc01c1..8ad718a506 100644
--- a/indra/llappearance/lltexlayerparams.cpp
+++ b/indra/llappearance/lltexlayerparams.cpp
@@ -69,7 +69,7 @@ LLTexLayerParam::LLTexLayerParam(const LLTexLayerParam& pOther)
 {
 }
 
-BOOL LLTexLayerParam::setInfo(LLViewerVisualParamInfo *info, BOOL add_to_appearance)
+bool LLTexLayerParam::setInfo(LLViewerVisualParamInfo *info, bool add_to_appearance)
 {
 	LLViewerVisualParam::setInfo(info);
 
@@ -123,8 +123,8 @@ LLTexLayerParamAlpha::LLTexLayerParamAlpha(LLTexLayerInterface* layer)
 	mCachedProcessedTexture(NULL),
 	mStaticImageTGA(),
 	mStaticImageRaw(),
-	mNeedsCreateTexture(FALSE),
-	mStaticImageInvalid(FALSE),
+	mNeedsCreateTexture(false),
+	mStaticImageInvalid(false),
 	mAvgDistortionVec(1.f, 1.f, 1.f),
 	mCachedEffectiveWeight(0.f)
 {
@@ -136,8 +136,8 @@ LLTexLayerParamAlpha::LLTexLayerParamAlpha(LLAvatarAppearance* appearance)
 	mCachedProcessedTexture(NULL),
 	mStaticImageTGA(),
 	mStaticImageRaw(),
-	mNeedsCreateTexture(FALSE),
-	mStaticImageInvalid(FALSE),
+	mNeedsCreateTexture(false),
+	mStaticImageInvalid(false),
 	mAvgDistortionVec(1.f, 1.f, 1.f),
 	mCachedEffectiveWeight(0.f)
 {
@@ -173,10 +173,10 @@ void LLTexLayerParamAlpha::deleteCaches()
 	mStaticImageTGA = NULL; // deletes image
 	mCachedProcessedTexture = NULL;
 	mStaticImageRaw = NULL;
-	mNeedsCreateTexture = FALSE;
+	mNeedsCreateTexture = false;
 }
 
-BOOL LLTexLayerParamAlpha::getMultiplyBlend() const
+bool LLTexLayerParamAlpha::getMultiplyBlend() const
 {
 	return ((LLTexLayerParamAlphaInfo *)getInfo())->mMultiplyBlend; 	
 }
@@ -216,7 +216,7 @@ void LLTexLayerParamAlpha::setAnimationTarget(F32 target_value)
 
 	mTargetWeight = target_value; 
 	setWeight(target_value); 
-	mIsAnimating = TRUE;
+	mIsAnimating = true;
 	if (mNext)
 	{
 		mNext->setAnimationTarget(target_value);
@@ -231,7 +231,7 @@ void LLTexLayerParamAlpha::animate(F32 delta)
 	}
 }
 
-BOOL LLTexLayerParamAlpha::getSkip() const
+bool LLTexLayerParamAlpha::getSkip() const
 {
 	if (!mTexLayer)
 	{
@@ -259,10 +259,10 @@ BOOL LLTexLayerParamAlpha::getSkip() const
 }
 
 
-BOOL LLTexLayerParamAlpha::render(S32 x, S32 y, S32 width, S32 height)
+bool LLTexLayerParamAlpha::render(S32 x, S32 y, S32 width, S32 height)
 {
     LL_PROFILE_ZONE_SCOPED;
-	BOOL success = true;
+	bool success = true;
 
 	if (!mTexLayer)
 	{
@@ -270,7 +270,7 @@ BOOL LLTexLayerParamAlpha::render(S32 x, S32 y, S32 width, S32 height)
 	}
 
 	F32 effective_weight = (mTexLayer->getTexLayerSet()->getAvatarAppearance()->getSex() & getSex()) ? mCurWeight : getDefaultWeight();
-	BOOL weight_changed = effective_weight != mCachedEffectiveWeight;
+	bool weight_changed = effective_weight != mCachedEffectiveWeight;
 	if (getSkip())
 	{
 		return success;
@@ -294,12 +294,12 @@ BOOL LLTexLayerParamAlpha::render(S32 x, S32 y, S32 width, S32 height)
 			// Don't load the image file until we actually need it the first time.  Like now.
 			mStaticImageTGA = LLTexLayerStaticImageList::getInstance()->getImageTGA(info->mStaticImageFileName);  
 			// We now have something in one of our caches
-			LLTexLayerSet::sHasCaches |= mStaticImageTGA.notNull() ? TRUE : FALSE;
+			LLTexLayerSet::sHasCaches |= mStaticImageTGA.notNull() ? true : false;
 
 			if (mStaticImageTGA.isNull())
 			{
 				LL_WARNS() << "Unable to load static file: " << info->mStaticImageFileName << LL_ENDL;
-				mStaticImageInvalid = TRUE; // don't try again.
+				mStaticImageInvalid = true; // don't try again.
 				return false;
 			}
 		}
@@ -316,10 +316,10 @@ BOOL LLTexLayerParamAlpha::render(S32 x, S32 y, S32 width, S32 height)
 			if (!mCachedProcessedTexture)
 			{
 				llassert(gTextureManagerBridgep);
-				mCachedProcessedTexture = gTextureManagerBridgep->getLocalTexture(image_tga_width, image_tga_height, 1, FALSE);
+				mCachedProcessedTexture = gTextureManagerBridgep->getLocalTexture(image_tga_width, image_tga_height, 1, false);
 
 				// We now have something in one of our caches
-				LLTexLayerSet::sHasCaches |= mCachedProcessedTexture ? TRUE : FALSE;
+				LLTexLayerSet::sHasCaches |= mCachedProcessedTexture ? true : false;
 
 				mCachedProcessedTexture->setExplicitFormat(GL_ALPHA8, GL_ALPHA);
 			}
@@ -328,7 +328,7 @@ BOOL LLTexLayerParamAlpha::render(S32 x, S32 y, S32 width, S32 height)
 			mStaticImageRaw = NULL;
 			mStaticImageRaw = new LLImageRaw;
 			mStaticImageTGA->decodeAndProcess(mStaticImageRaw, info->mDomain, effective_weight);
-			mNeedsCreateTexture = TRUE;			
+			mNeedsCreateTexture = true;
 			LL_DEBUGS() << "Built Cached Alpha: " << info->mStaticImageFileName << ": (" << mStaticImageRaw->getWidth() << ", " << mStaticImageRaw->getHeight() << ") " << "Domain: " << info->mDomain << " Weight: " << effective_weight << LL_ENDL;
 		}
 
@@ -339,7 +339,7 @@ BOOL LLTexLayerParamAlpha::render(S32 x, S32 y, S32 width, S32 height)
 				if (mNeedsCreateTexture)
 				{
 					mCachedProcessedTexture->createGLTexture(0, mStaticImageRaw);
-					mNeedsCreateTexture = FALSE;
+					mNeedsCreateTexture = false;
 					gGL.getTexUnit(0)->bind(mCachedProcessedTexture);
 					mCachedProcessedTexture->setAddressMode(LLTexUnit::TAM_CLAMP);
 				}
@@ -372,8 +372,8 @@ BOOL LLTexLayerParamAlpha::render(S32 x, S32 y, S32 width, S32 height)
 // LLTexLayerParamAlphaInfo
 //-----------------------------------------------------------------------------
 LLTexLayerParamAlphaInfo::LLTexLayerParamAlphaInfo() :
-	mMultiplyBlend(FALSE),
-	mSkipIfZeroWeight(FALSE),
+	mMultiplyBlend(false),
+	mSkipIfZeroWeight(false),
 	mDomain(0.f)
 {
 }
@@ -514,7 +514,7 @@ void LLTexLayerParamColor::setAnimationTarget(F32 target_value)
 	// set value first then set interpolating flag to ignore further updates
 	mTargetWeight = target_value; 
 	setWeight(target_value);
-	mIsAnimating = TRUE;
+	mIsAnimating = true;
 	if (mNext)
 	{
 		mNext->setAnimationTarget(target_value);
diff --git a/indra/llappearance/lltexlayerparams.h b/indra/llappearance/lltexlayerparams.h
index 1dbfd0b3d6..3767a9627f 100644
--- a/indra/llappearance/lltexlayerparams.h
+++ b/indra/llappearance/lltexlayerparams.h
@@ -48,7 +48,7 @@ class LLTexLayerParam : public LLViewerVisualParam
 public: 
 	LLTexLayerParam(LLTexLayerInterface *layer);
 	LLTexLayerParam(LLAvatarAppearance *appearance);
-	/*virtual*/ BOOL setInfo(LLViewerVisualParamInfo *info, BOOL add_to_appearance);
+	/*virtual*/ bool setInfo(LLViewerVisualParamInfo *info, bool add_to_appearance);
 	/*virtual*/ LLViewerVisualParam* cloneParam(LLWearable* wearable) const = 0;
 
 protected:
@@ -74,7 +74,7 @@ public:
 	/*virtual*/ LLViewerVisualParam* cloneParam(LLWearable* wearable = NULL) const;
 
 	// LLVisualParam Virtual functions
-	///*virtual*/ BOOL		parseData(LLXmlTreeNode* node);
+	///*virtual*/ bool		parseData(LLXmlTreeNode* node);
 	/*virtual*/ void		apply( ESex avatar_sex ) {}
 	/*virtual*/ void		setWeight(F32 weight);
 	/*virtual*/ void		setAnimationTarget(F32 target_value); 
@@ -89,10 +89,10 @@ public:
 	/*virtual*/ const LLVector4a*	getNextDistortion(U32 *index, LLPolyMesh **poly_mesh)	{ index = 0; poly_mesh = NULL; return NULL;};
 
 	// New functions
-	BOOL					render( S32 x, S32 y, S32 width, S32 height );
-	BOOL					getSkip() const;
+	bool					render( S32 x, S32 y, S32 width, S32 height );
+	bool					getSkip() const;
 	void					deleteCaches();
-	BOOL					getMultiplyBlend() const;
+	bool					getMultiplyBlend() const;
 
 private:
 	LLTexLayerParamAlpha(const LLTexLayerParamAlpha& pOther);
@@ -100,8 +100,8 @@ private:
 	LLPointer<LLGLTexture>	mCachedProcessedTexture;
 	LLPointer<LLImageTGA>	mStaticImageTGA;
 	LLPointer<LLImageRaw>	mStaticImageRaw;
-	std::atomic<BOOL>		mNeedsCreateTexture;
-	BOOL					mStaticImageInvalid;
+	std::atomic<bool>		mNeedsCreateTexture;
+	bool					mStaticImageInvalid;
 	LL_ALIGN_16(LLVector4a				mAvgDistortionVec);
 	F32						mCachedEffectiveWeight;
 
@@ -124,8 +124,8 @@ public:
 
 private:
 	std::string				mStaticImageFileName;
-	BOOL					mMultiplyBlend;
-	BOOL					mSkipIfZeroWeight;
+	bool					mMultiplyBlend;
+	bool					mSkipIfZeroWeight;
 	F32						mDomain;
 };
 //
@@ -157,7 +157,7 @@ public:
 	/*virtual*/ LLViewerVisualParam* cloneParam(LLWearable* wearable = NULL) const;
 
 	// LLVisualParam Virtual functions
-	///*virtual*/ BOOL			parseData(LLXmlTreeNode* node);
+	///*virtual*/ bool			parseData(LLXmlTreeNode* node);
 	/*virtual*/ void			apply( ESex avatar_sex ) {}
 	/*virtual*/ void			setWeight(F32 weight);
 	/*virtual*/ void			setAnimationTarget(F32 target_value);
diff --git a/indra/llappearance/llviewervisualparam.cpp b/indra/llappearance/llviewervisualparam.cpp
index 43fb8fab5e..30a244be93 100644
--- a/indra/llappearance/llviewervisualparam.cpp
+++ b/indra/llappearance/llviewervisualparam.cpp
@@ -39,12 +39,12 @@
 LLViewerVisualParamInfo::LLViewerVisualParamInfo()
 	:
 	mWearableType( LLWearableType::WT_INVALID ),
-	mCrossWearable(FALSE),
+	mCrossWearable(false),
 	mCamDist( 0.5f ),
 	mCamAngle( 0.f ),
 	mCamElevation( 0.f ),
 	mEditGroupDisplayOrder( 0 ),
-	mShowSimple(FALSE),
+	mShowSimple(false),
 	mSimpleMin(0.f),
 	mSimpleMax(100.f)
 {
@@ -82,7 +82,7 @@ bool LLViewerVisualParamInfo::parseXml(LLXmlTreeNode *node)
 	static LLStdStringHandle cross_wearable_string = LLXmlTree::addAttributeString("cross_wearable");
 	if (!node->getFastAttributeBOOL(cross_wearable_string, mCrossWearable))
 	{
-		mCrossWearable = FALSE;
+		mCrossWearable = false;
 	}
 
 	// Optional camera offsets from the current joint center.  Used for generating "hints" (thumbnails).
@@ -146,7 +146,7 @@ LLViewerVisualParam::~LLViewerVisualParam()
 // setInfo()
 //-----------------------------------------------------------------------------
 
-BOOL LLViewerVisualParam::setInfo(LLViewerVisualParamInfo *info)
+bool LLViewerVisualParam::setInfo(LLViewerVisualParamInfo *info)
 {
 	llassert(mInfo == NULL);
 	if (info->mID < 0)
diff --git a/indra/llappearance/llviewervisualparam.h b/indra/llappearance/llviewervisualparam.h
index 9ad3e6eae8..42c32aa319 100644
--- a/indra/llappearance/llviewervisualparam.h
+++ b/indra/llappearance/llviewervisualparam.h
@@ -49,13 +49,13 @@ public:
 
 protected:
 	S32			mWearableType;
-	BOOL		mCrossWearable;
+	bool		mCrossWearable;
 	std::string	mEditGroup;
 	F32			mCamDist;
 	F32			mCamAngle;		// degrees
 	F32			mCamElevation;
 	F32			mEditGroupDisplayOrder;
-	BOOL		mShowSimple;	// show edit controls when in "simple ui" mode?
+	bool		mShowSimple;	// show edit controls when in "simple ui" mode?
 	F32			mSimpleMin;		// when in simple UI, apply this minimum, range 0.f to 100.f
 	F32			mSimpleMax;		// when in simple UI, apply this maximum, range 0.f to 100.f
 };
@@ -75,12 +75,12 @@ public:
 	// Special: These functions are overridden by child classes
 	LLViewerVisualParamInfo 	*getInfo() const { return (LLViewerVisualParamInfo*)mInfo; };
 	//   This sets mInfo and calls initialization functions
-	BOOL						setInfo(LLViewerVisualParamInfo *info);
+	bool						setInfo(LLViewerVisualParamInfo *info);
 
 	virtual LLViewerVisualParam* cloneParam(LLWearable* wearable) const = 0;
 	
 	// LLVisualParam Virtual functions
-	///*virtual*/ BOOL			parseData(LLXmlTreeNode* node);
+	///*virtual*/ bool			parseData(LLXmlTreeNode* node);
 
 	// New Virtual functions
 	virtual F32					getTotalDistortion() = 0;
@@ -99,11 +99,11 @@ public:
 	F32					getCameraAngle() const		{ return getInfo()->mCamAngle; }  // degrees
 	F32					getCameraElevation() const	{ return getInfo()->mCamElevation; } 
 	
-	BOOL				getShowSimple() const		{ return getInfo()->mShowSimple; }
+	bool				getShowSimple() const		{ return getInfo()->mShowSimple; }
 	F32					getSimpleMin() const		{ return getInfo()->mSimpleMin; }
 	F32					getSimpleMax() const		{ return getInfo()->mSimpleMax; }
 
-	BOOL				getCrossWearable() const 	{ return getInfo()->mCrossWearable; }
+	bool				getCrossWearable() const 	{ return getInfo()->mCrossWearable; }
 
 protected:
 	LLViewerVisualParam(const LLViewerVisualParam& pOther);
diff --git a/indra/llappearance/llwearable.cpp b/indra/llappearance/llwearable.cpp
index db7db32b3e..853b850fed 100644
--- a/indra/llappearance/llwearable.cpp
+++ b/indra/llappearance/llwearable.cpp
@@ -86,14 +86,14 @@ LLAssetType::EType LLWearable::getAssetType() const
 	return LLWearableType::getInstance()->getAssetType(mType);
 }
 
-BOOL LLWearable::exportFile(const std::string& filename) const
+bool LLWearable::exportFile(const std::string& filename) const
 {
 	llofstream ofs(filename.c_str(), std::ios_base::out | std::ios_base::trunc | std::ios_base::binary);
 	return ofs.is_open() && exportStream(ofs);
 }
 
 // virtual
-BOOL LLWearable::exportStream( std::ostream& output_stream ) const
+bool LLWearable::exportStream( std::ostream& output_stream ) const
 {
 	if (!output_stream.good()) return false;
 
@@ -469,7 +469,7 @@ LLWearable::EImportResult LLWearable::importStream( std::istream& input_stream,
 	return LLWearable::SUCCESS;
 }
 
-BOOL LLWearable::getNextPopulatedLine(std::istream& input_stream, char* buffer, U32 buffer_size)
+bool LLWearable::getNextPopulatedLine(std::istream& input_stream, char* buffer, U32 buffer_size)
 {
 	if (!input_stream.good())
 	{
@@ -636,7 +636,7 @@ void LLWearable::addVisualParam(LLVisualParam *param)
 	{
 		delete mVisualParamIndexMap[param->getID()];
 	}
-	param->setIsDummy(FALSE);
+	param->setIsDummy(false);
 	param->setParamLocation(LOC_WEARABLE);
 	mVisualParamIndexMap[param->getID()] = param;
 	mSavedVisualParamMap[param->getID()] = param->getDefaultWeight();
diff --git a/indra/llappearance/llwearable.h b/indra/llappearance/llwearable.h
index d86db236a3..ccdb3273f2 100644
--- a/indra/llappearance/llwearable.h
+++ b/indra/llappearance/llwearable.h
@@ -80,9 +80,9 @@ public:
 		SUCCESS,
 		BAD_HEADER
 	};
-	BOOL				exportFile(const std::string& filename) const;
+	bool				exportFile(const std::string& filename) const;
 	EImportResult		importFile(const std::string& filename, LLAvatarAppearance* avatarp );
-	virtual BOOL				exportStream( std::ostream& output_stream ) const;
+	virtual bool				exportStream( std::ostream& output_stream ) const;
 	virtual EImportResult		importStream( std::istream& input_stream, LLAvatarAppearance* avatarp );
 
 	static void			setCurrentDefinitionVersion( S32 version ) { LLWearable::sCurrentDefinitionVersion = version; }
@@ -118,7 +118,7 @@ protected:
 	void				destroyTextures();
 	void			 	createVisualParams(LLAvatarAppearance *avatarp);
 	void 				createLayers(S32 te, LLAvatarAppearance *avatarp);
-	BOOL				getNextPopulatedLine(std::istream& input_stream, char* buffer, U32 buffer_size);
+	bool				getNextPopulatedLine(std::istream& input_stream, char* buffer, U32 buffer_size);
 
 	static S32			sCurrentDefinitionVersion;	// Depends on the current state of the avatar_lad.xml.
 	S32					mDefinitionVersion;			// Depends on the state of the avatar_lad.xml when this asset was created.
diff --git a/indra/llappearance/llwearabledata.cpp b/indra/llappearance/llwearabledata.cpp
index 2a0b77ee39..db5c93352a 100644
--- a/indra/llappearance/llwearabledata.cpp
+++ b/indra/llappearance/llwearabledata.cpp
@@ -86,7 +86,7 @@ void LLWearableData::setWearable(const LLWearableType::EType type, U32 index, LL
 	{
 		wearable_vec[index] = wearable;
 		old_wearable->setUpdated();
-		const BOOL removed = FALSE;
+		const bool removed = false;
 		wearableUpdated(wearable, removed);
 	}
 }
@@ -105,14 +105,14 @@ void LLWearableData::pushWearable(const LLWearableType::EType type,
 		mWearableDatas[type].push_back(wearable);
 		if (trigger_updated)
 		{
-			const BOOL removed = FALSE;
+			const bool removed = false;
 			wearableUpdated(wearable, removed);
 		}
 	}
 }
 
 // virtual
-void LLWearableData::wearableUpdated(LLWearable *wearable, BOOL removed)
+void LLWearableData::wearableUpdated(LLWearable *wearable, bool removed)
 {
 	wearable->setUpdated();
 	if (!removed)
@@ -144,7 +144,7 @@ void LLWearableData::eraseWearable(const LLWearableType::EType type, U32 index)
 	if (wearable)
 	{
 		mWearableDatas[type].erase(mWearableDatas[type].begin() + index);
-		const BOOL removed = TRUE;
+		const bool removed = true;
 		wearableUpdated(wearable, removed);
 	}
 }
@@ -200,7 +200,7 @@ void LLWearableData::pullCrossWearableValues(const LLWearableType::EType type)
 }
 
 
-BOOL LLWearableData::getWearableIndex(const LLWearable *wearable, U32& index_found) const
+bool LLWearableData::getWearableIndex(const LLWearable *wearable, U32& index_found) const
 {
 	if (wearable == NULL)
 	{
@@ -242,7 +242,7 @@ U32 LLWearableData::getClothingLayerCount() const
 	return count;
 }
 
-BOOL LLWearableData::canAddWearable(const LLWearableType::EType type) const
+bool LLWearableData::canAddWearable(const LLWearableType::EType type) const
 {
     LLAssetType::EType a_type = LLWearableType::getInstance()->getAssetType(type);
 	if (a_type==LLAssetType::AT_CLOTHING)
@@ -259,7 +259,7 @@ BOOL LLWearableData::canAddWearable(const LLWearableType::EType type) const
 	}
 }
 
-BOOL LLWearableData::isOnTop(LLWearable* wearable) const
+bool LLWearableData::isOnTop(LLWearable* wearable) const
 {
 	if (!wearable) return false;
 	const LLWearableType::EType type = wearable->getType();
diff --git a/indra/llappearance/llwearabledata.h b/indra/llappearance/llwearabledata.h
index b8e0bf8bd1..2fe9ae2302 100644
--- a/indra/llappearance/llwearabledata.h
+++ b/indra/llappearance/llwearabledata.h
@@ -60,11 +60,11 @@ public:
 	const LLWearable*	getBottomWearable(const LLWearableType::EType type) const;
 	U32				getWearableCount(const LLWearableType::EType type) const;
 	U32				getWearableCount(const U32 tex_index) const;
-	BOOL			getWearableIndex(const LLWearable *wearable, U32& index) const;
+	bool			getWearableIndex(const LLWearable *wearable, U32& index) const;
 	U32				getClothingLayerCount() const;
-	BOOL			canAddWearable(const LLWearableType::EType type) const;
+	bool			canAddWearable(const LLWearableType::EType type) const;
 
-	BOOL			isOnTop(LLWearable* wearable) const;
+	bool			isOnTop(LLWearable* wearable) const;
 	
 	static const U32 MAX_CLOTHING_LAYERS = 60;
 
@@ -76,7 +76,7 @@ protected:
 	void 			setWearable(const LLWearableType::EType type, U32 index, LLWearable *wearable);
 	void 			pushWearable(const LLWearableType::EType type, LLWearable *wearable, 
 								 bool trigger_updated = true);
-	virtual void	wearableUpdated(LLWearable *wearable, BOOL removed);
+	virtual void	wearableUpdated(LLWearable *wearable, bool removed);
 	void 			eraseWearable(LLWearable *wearable);
 	void			eraseWearable(const LLWearableType::EType type, U32 index);
 	void			clearWearableType(const LLWearableType::EType type);
diff --git a/indra/llappearance/llwearabletype.cpp b/indra/llappearance/llwearabletype.cpp
index 056f7cf888..c561502a3d 100644
--- a/indra/llappearance/llwearabletype.cpp
+++ b/indra/llappearance/llwearabletype.cpp
@@ -32,27 +32,27 @@
 
 LLWearableType::LLWearableDictionary::LLWearableDictionary(LLTranslationBridge::ptr_t& trans)
 {
-	addEntry(LLWearableType::WT_SHAPE,        new WearableEntry(trans, "shape",       "New Shape",			LLAssetType::AT_BODYPART, 	LLInventoryType::ICONNAME_BODYPART_SHAPE, FALSE, FALSE));
-	addEntry(LLWearableType::WT_SKIN,         new WearableEntry(trans, "skin",        "New Skin",			LLAssetType::AT_BODYPART, 	LLInventoryType::ICONNAME_BODYPART_SKIN, FALSE, FALSE));
-	addEntry(LLWearableType::WT_HAIR,         new WearableEntry(trans, "hair",        "New Hair",			LLAssetType::AT_BODYPART, 	LLInventoryType::ICONNAME_BODYPART_HAIR, FALSE, FALSE));
-	addEntry(LLWearableType::WT_EYES,         new WearableEntry(trans, "eyes",        "New Eyes",			LLAssetType::AT_BODYPART, 	LLInventoryType::ICONNAME_BODYPART_EYES, FALSE, FALSE));
-	addEntry(LLWearableType::WT_SHIRT,        new WearableEntry(trans, "shirt",       "New Shirt",			LLAssetType::AT_CLOTHING, 	LLInventoryType::ICONNAME_CLOTHING_SHIRT, FALSE, TRUE));
-	addEntry(LLWearableType::WT_PANTS,        new WearableEntry(trans, "pants",       "New Pants",			LLAssetType::AT_CLOTHING, 	LLInventoryType::ICONNAME_CLOTHING_PANTS, FALSE, TRUE));
-	addEntry(LLWearableType::WT_SHOES,        new WearableEntry(trans, "shoes",       "New Shoes",			LLAssetType::AT_CLOTHING, 	LLInventoryType::ICONNAME_CLOTHING_SHOES, FALSE, TRUE));
-	addEntry(LLWearableType::WT_SOCKS,        new WearableEntry(trans, "socks",       "New Socks",			LLAssetType::AT_CLOTHING, 	LLInventoryType::ICONNAME_CLOTHING_SOCKS, FALSE, TRUE));
-	addEntry(LLWearableType::WT_JACKET,       new WearableEntry(trans, "jacket",      "New Jacket",		LLAssetType::AT_CLOTHING, 	LLInventoryType::ICONNAME_CLOTHING_JACKET, FALSE, TRUE));
-	addEntry(LLWearableType::WT_GLOVES,       new WearableEntry(trans, "gloves",      "New Gloves",		LLAssetType::AT_CLOTHING, 	LLInventoryType::ICONNAME_CLOTHING_GLOVES, FALSE, TRUE));
-	addEntry(LLWearableType::WT_UNDERSHIRT,   new WearableEntry(trans, "undershirt",  "New Undershirt",	LLAssetType::AT_CLOTHING, 	LLInventoryType::ICONNAME_CLOTHING_UNDERSHIRT, FALSE, TRUE));
-	addEntry(LLWearableType::WT_UNDERPANTS,   new WearableEntry(trans, "underpants",  "New Underpants",	LLAssetType::AT_CLOTHING, 	LLInventoryType::ICONNAME_CLOTHING_UNDERPANTS, FALSE, TRUE));
-	addEntry(LLWearableType::WT_SKIRT,        new WearableEntry(trans, "skirt",       "New Skirt",			LLAssetType::AT_CLOTHING, 	LLInventoryType::ICONNAME_CLOTHING_SKIRT, FALSE, TRUE));
-	addEntry(LLWearableType::WT_ALPHA,        new WearableEntry(trans, "alpha",       "New Alpha",			LLAssetType::AT_CLOTHING, 	LLInventoryType::ICONNAME_CLOTHING_ALPHA, FALSE, TRUE));
-	addEntry(LLWearableType::WT_TATTOO,       new WearableEntry(trans, "tattoo",      "New Tattoo",		LLAssetType::AT_CLOTHING, 	LLInventoryType::ICONNAME_CLOTHING_TATTOO, FALSE, TRUE));
-	addEntry(LLWearableType::WT_UNIVERSAL,    new WearableEntry(trans, "universal",   "New Universal",     LLAssetType::AT_CLOTHING,   LLInventoryType::ICONNAME_CLOTHING_UNIVERSAL, FALSE, TRUE));
-
-	addEntry(LLWearableType::WT_PHYSICS,      new WearableEntry(trans, "physics",     "New Physics",		LLAssetType::AT_CLOTHING, 	LLInventoryType::ICONNAME_CLOTHING_PHYSICS, TRUE, TRUE));
-
-	addEntry(LLWearableType::WT_INVALID,      new WearableEntry(trans, "invalid",     "Invalid Wearable", 	LLAssetType::AT_NONE, 		LLInventoryType::ICONNAME_UNKNOWN, FALSE, FALSE));
-	addEntry(LLWearableType::WT_NONE,      	  new WearableEntry(trans, "none",        "Invalid Wearable", 	LLAssetType::AT_NONE, 		LLInventoryType::ICONNAME_NONE, FALSE, FALSE));
+	addEntry(LLWearableType::WT_SHAPE,        new WearableEntry(trans, "shape",       "New Shape",			LLAssetType::AT_BODYPART, 	LLInventoryType::ICONNAME_BODYPART_SHAPE, false, false));
+	addEntry(LLWearableType::WT_SKIN,         new WearableEntry(trans, "skin",        "New Skin",			LLAssetType::AT_BODYPART, 	LLInventoryType::ICONNAME_BODYPART_SKIN, false, false));
+	addEntry(LLWearableType::WT_HAIR,         new WearableEntry(trans, "hair",        "New Hair",			LLAssetType::AT_BODYPART, 	LLInventoryType::ICONNAME_BODYPART_HAIR, false, false));
+	addEntry(LLWearableType::WT_EYES,         new WearableEntry(trans, "eyes",        "New Eyes",			LLAssetType::AT_BODYPART, 	LLInventoryType::ICONNAME_BODYPART_EYES, false, false));
+	addEntry(LLWearableType::WT_SHIRT,        new WearableEntry(trans, "shirt",       "New Shirt",			LLAssetType::AT_CLOTHING, 	LLInventoryType::ICONNAME_CLOTHING_SHIRT, false, true));
+	addEntry(LLWearableType::WT_PANTS,        new WearableEntry(trans, "pants",       "New Pants",			LLAssetType::AT_CLOTHING, 	LLInventoryType::ICONNAME_CLOTHING_PANTS, false, true));
+	addEntry(LLWearableType::WT_SHOES,        new WearableEntry(trans, "shoes",       "New Shoes",			LLAssetType::AT_CLOTHING, 	LLInventoryType::ICONNAME_CLOTHING_SHOES, false, true));
+	addEntry(LLWearableType::WT_SOCKS,        new WearableEntry(trans, "socks",       "New Socks",			LLAssetType::AT_CLOTHING, 	LLInventoryType::ICONNAME_CLOTHING_SOCKS, false, true));
+	addEntry(LLWearableType::WT_JACKET,       new WearableEntry(trans, "jacket",      "New Jacket",		LLAssetType::AT_CLOTHING, 	LLInventoryType::ICONNAME_CLOTHING_JACKET, false, true));
+	addEntry(LLWearableType::WT_GLOVES,       new WearableEntry(trans, "gloves",      "New Gloves",		LLAssetType::AT_CLOTHING, 	LLInventoryType::ICONNAME_CLOTHING_GLOVES, false, true));
+	addEntry(LLWearableType::WT_UNDERSHIRT,   new WearableEntry(trans, "undershirt",  "New Undershirt",	LLAssetType::AT_CLOTHING, 	LLInventoryType::ICONNAME_CLOTHING_UNDERSHIRT, false, true));
+	addEntry(LLWearableType::WT_UNDERPANTS,   new WearableEntry(trans, "underpants",  "New Underpants",	LLAssetType::AT_CLOTHING, 	LLInventoryType::ICONNAME_CLOTHING_UNDERPANTS, false, true));
+	addEntry(LLWearableType::WT_SKIRT,        new WearableEntry(trans, "skirt",       "New Skirt",			LLAssetType::AT_CLOTHING, 	LLInventoryType::ICONNAME_CLOTHING_SKIRT, false, true));
+	addEntry(LLWearableType::WT_ALPHA,        new WearableEntry(trans, "alpha",       "New Alpha",			LLAssetType::AT_CLOTHING, 	LLInventoryType::ICONNAME_CLOTHING_ALPHA, false, true));
+	addEntry(LLWearableType::WT_TATTOO,       new WearableEntry(trans, "tattoo",      "New Tattoo",		LLAssetType::AT_CLOTHING, 	LLInventoryType::ICONNAME_CLOTHING_TATTOO, false, true));
+	addEntry(LLWearableType::WT_UNIVERSAL,    new WearableEntry(trans, "universal",   "New Universal",     LLAssetType::AT_CLOTHING,   LLInventoryType::ICONNAME_CLOTHING_UNIVERSAL, false, true));
+
+	addEntry(LLWearableType::WT_PHYSICS,      new WearableEntry(trans, "physics",     "New Physics",		LLAssetType::AT_CLOTHING, 	LLInventoryType::ICONNAME_CLOTHING_PHYSICS, true, true));
+
+	addEntry(LLWearableType::WT_INVALID,      new WearableEntry(trans, "invalid",     "Invalid Wearable", 	LLAssetType::AT_NONE, 		LLInventoryType::ICONNAME_UNKNOWN, false, false));
+	addEntry(LLWearableType::WT_NONE,      	  new WearableEntry(trans, "none",        "Invalid Wearable", 	LLAssetType::AT_NONE, 		LLInventoryType::ICONNAME_NONE, false, false));
 }
 
 
@@ -112,14 +112,14 @@ LLInventoryType::EIconName LLWearableType::getIconName(LLWearableType::EType typ
 	return entry->mIconName;
 } 
 
-BOOL LLWearableType::getDisableCameraSwitch(LLWearableType::EType type)
+bool LLWearableType::getDisableCameraSwitch(LLWearableType::EType type)
 {
 	const WearableEntry *entry = mDictionary.lookup(type);
 	if (!entry) return false;
 	return entry->mDisableCameraSwitch;
 }
 
-BOOL LLWearableType::getAllowMultiwear(LLWearableType::EType type)
+bool LLWearableType::getAllowMultiwear(LLWearableType::EType type)
 {
 	const WearableEntry *entry = mDictionary.lookup(type);
 	if (!entry) return false;
diff --git a/indra/llappearance/llwearabletype.h b/indra/llappearance/llwearabletype.h
index 793a33cc87..d2a85581bc 100644
--- a/indra/llappearance/llwearabletype.h
+++ b/indra/llappearance/llwearabletype.h
@@ -72,8 +72,8 @@ public:
 	LLAssetType::EType 					getAssetType(EType type);
 	EType 								typeNameToType(const std::string& type_name);
 	LLInventoryType::EIconName 			getIconName(EType type);
-	BOOL 								getDisableCameraSwitch(EType type);
-	BOOL 								getAllowMultiwear(EType type);
+	bool 								getDisableCameraSwitch(EType type);
+	bool 								getAllowMultiwear(EType type);
 
 	static EType						inventoryFlagsToWearableType(U32 flags);
 
@@ -85,8 +85,8 @@ private:
             const std::string& default_new_name,
             LLAssetType::EType assetType,
             LLInventoryType::EIconName iconName,
-            BOOL disable_camera_switch = FALSE,
-            BOOL allow_multiwear = TRUE) :
+            bool disable_camera_switch = false,
+            bool allow_multiwear = true) :
             LLDictionaryEntry(name),
             mAssetType(assetType),
             mDefaultNewName(default_new_name),
@@ -101,8 +101,8 @@ private:
         const std::string mLabel;
         const std::string mDefaultNewName;
         LLInventoryType::EIconName mIconName;
-        BOOL mDisableCameraSwitch;
-        BOOL mAllowMultiwear;
+        bool mDisableCameraSwitch;
+        bool mAllowMultiwear;
     };
 
     class LLWearableDictionary : public LLDictionary<LLWearableType::EType, WearableEntry>
diff --git a/indra/llcharacter/llanimationstates.cpp b/indra/llcharacter/llanimationstates.cpp
index 2e78e30405..604c68a225 100644
--- a/indra/llcharacter/llanimationstates.cpp
+++ b/indra/llcharacter/llanimationstates.cpp
@@ -367,7 +367,7 @@ const char *LLAnimationLibrary::animStateToString( const LLUUID& state )
 //-----------------------------------------------------------------------------
 // Return the animation state for a given name
 //-----------------------------------------------------------------------------
-LLUUID LLAnimationLibrary::stringToAnimState( const std::string& name, BOOL allow_ids )
+LLUUID LLAnimationLibrary::stringToAnimState( const std::string& name, bool allow_ids )
 {
 	std::string lower_case_name(name);
 	LLStringUtil::toLower(lower_case_name);
@@ -391,7 +391,7 @@ LLUUID LLAnimationLibrary::stringToAnimState( const std::string& name, BOOL allo
 	else if (allow_ids)
 	{
 		// try to convert string to LLUUID
-		id.set(name, FALSE);
+		id.set(name, false);
 	}
 
 	return id;
diff --git a/indra/llcharacter/llanimationstates.h b/indra/llcharacter/llanimationstates.h
index 79cbcabdc1..1757ce07a1 100644
--- a/indra/llcharacter/llanimationstates.h
+++ b/indra/llcharacter/llanimationstates.h
@@ -220,7 +220,7 @@ public:
 	// Return the animation state for the given name.
 	// Retun NULL if the name is invalid.
 	//-----------------------------------------------------------------------------
-	LLUUID stringToAnimState( const std::string& name, BOOL allow_ids = TRUE );
+	LLUUID stringToAnimState( const std::string& name, bool allow_ids = true );
 
 	//-----------------------------------------------------------------------------
 	// Associate an anim state with a name
diff --git a/indra/llcharacter/llbvhloader.cpp b/indra/llcharacter/llbvhloader.cpp
index 567bdb8c95..44e95c4e7f 100644
--- a/indra/llcharacter/llbvhloader.cpp
+++ b/indra/llcharacter/llbvhloader.cpp
@@ -184,7 +184,7 @@ LLBVHLoader::LLBVHLoader(const char* buffer, ELoadStatus &loadStatus, S32 &error
 	LL_DEBUGS("BVH") << "After translations and optimize" << LL_ENDL;
 	dumpBVHInfo();
 
-	mInitialized = TRUE;
+	mInitialized = true;
 }
 
 
@@ -227,7 +227,7 @@ ELoadStatus LLBVHLoader::loadTranslationTable(const char *fileName)
 	//--------------------------------------------------------------------
 	// load data one line at a time
 	//--------------------------------------------------------------------
-	BOOL loadingGlobals = FALSE;
+	bool loadingGlobals = false;
 	while ( getLine(fp) )
 	{
 		//----------------------------------------------------------------
@@ -251,7 +251,7 @@ ELoadStatus LLBVHLoader::loadTranslationTable(const char *fileName)
 
 			if (strcmp(name, "GLOBALS")==0)
 			{
-				loadingGlobals = TRUE;
+				loadingGlobals = true;
 				continue;
 			}
 		}
@@ -298,7 +298,7 @@ ELoadStatus LLBVHLoader::loadTranslationTable(const char *fileName)
 
 			if ( sscanf(mLine, " %*s = %f %f", &loop_in, &loop_out) == 2 )
 			{
-				mLoop = TRUE;
+				mLoop = true;
 			}
 			else if ( sscanf(mLine, " %*s = %127s", trueFalse) == 1 )	/* Flawfinder: ignore */	
 			{
@@ -496,8 +496,8 @@ void LLBVHLoader::makeTranslation(std::string alias_name, std::string joint_name
     
 if (joint_name == "mPelvis")
     {
-        newTrans.mRelativePositionKey = TRUE;
-        newTrans.mRelativeRotationKey = TRUE;
+        newTrans.mRelativePositionKey = true;
+        newTrans.mRelativeRotationKey = true;
     }
 
 }
@@ -609,7 +609,7 @@ ELoadStatus LLBVHLoader::loadBVHFile(const char *buffer, char* error_text, S32 &
 	//--------------------------------------------------------------------
 	// consume joints
 	//--------------------------------------------------------------------
-	while (TRUE)
+	while (true)
 	{
 		//----------------------------------------------------------------
 		// get next line
@@ -969,7 +969,7 @@ void LLBVHLoader::applyTranslations()
 		if ( trans.mIgnore )
 		{
             //LL_INFOS() << "NOTE: Ignoring " << joint->mName.c_str() << LL_ENDL;
-			joint->mIgnore = TRUE;
+			joint->mIgnore = true;
 			continue;
 		}
 
@@ -983,10 +983,10 @@ void LLBVHLoader::applyTranslations()
 		}
 
         //Allow joint position changes as of SL-318
-        joint->mIgnorePositions = FALSE;
+        joint->mIgnorePositions = false;
         if (joint->mNumChannels == 3)
         {
-            joint->mIgnorePositions = TRUE;
+            joint->mIgnorePositions = true;
         }
 
 		//----------------------------------------------------------------
@@ -995,13 +995,13 @@ void LLBVHLoader::applyTranslations()
 		if ( trans.mRelativePositionKey )
 		{
 //			LL_INFOS() << "NOTE: Removing 1st position offset from all keys for " << joint->mOutName.c_str() << LL_ENDL;
-			joint->mRelativePositionKey = TRUE;
+			joint->mRelativePositionKey = true;
 		}
 
 		if ( trans.mRelativeRotationKey )
 		{
 //			LL_INFOS() << "NOTE: Removing 1st rotation from all keys for " << joint->mOutName.c_str() << LL_ENDL;
-			joint->mRelativeRotationKey = TRUE;
+			joint->mRelativeRotationKey = true;
 		}
 		
 		if ( trans.mRelativePosition.magVec() > 0.0f )
@@ -1065,8 +1065,8 @@ void LLBVHLoader::optimize()
 
 	for (Joint* joint : mJoints)
 	{
-		BOOL pos_changed = FALSE;
-		BOOL rot_changed = FALSE;
+		bool pos_changed = false;
+		bool rot_changed = false;
 
 		if ( ! joint->mIgnore )
 		{
@@ -1079,7 +1079,7 @@ void LLBVHLoader::optimize()
 			// no keys?
 			if (first_key == joint->mKeys.end())
 			{
-				joint->mIgnore = TRUE;
+				joint->mIgnore = true;
 				continue;
 			}
 
@@ -1092,13 +1092,13 @@ void LLBVHLoader::optimize()
 			{
 				// *FIX: use single frame to move pelvis
 				// if only one keyframe force output for this joint
-				rot_changed = TRUE;
+				rot_changed = true;
 			}
 			else
 			{
 				// if more than one keyframe, use first frame as reference and skip to second
-				first_key->mIgnorePos = TRUE;
-				first_key->mIgnoreRot = TRUE;
+				first_key->mIgnorePos = true;
+				first_key->mIgnoreRot = true;
 				++ki;
 			}
 
@@ -1119,7 +1119,7 @@ void LLBVHLoader::optimize()
 					joint->mNumPosKeys++;
 					if (dist_vec_squared(LLVector3(ki_prev->mPos), first_frame_pos) > POSITION_MOTION_THRESHOLD_SQUARED)
 					{
-						pos_changed = TRUE;
+						pos_changed = true;
 					}
 				}
 				else
@@ -1132,12 +1132,12 @@ void LLBVHLoader::optimize()
 
 					if (dist_vec_squared(current_pos, first_frame_pos) > POSITION_MOTION_THRESHOLD_SQUARED)
 					{
-						pos_changed = TRUE;
+						pos_changed = true;
 					}
 
 					if (dist_vec_squared(interp_pos, test_pos) < POSITION_KEYFRAME_THRESHOLD_SQUARED)
 					{
-						ki_prev->mIgnorePos = TRUE;
+						ki_prev->mIgnorePos = true;
 						numPosFramesConsidered++;
 					}
 					else
@@ -1158,7 +1158,7 @@ void LLBVHLoader::optimize()
 
 					if (rot_test > ROTATION_MOTION_THRESHOLD)
 					{
-						rot_changed = TRUE;
+						rot_changed = true;
 					}
 				}
 				else
@@ -1180,7 +1180,7 @@ void LLBVHLoader::optimize()
 					rot_test = x_delta + y_delta;
 					if (rot_test > ROTATION_MOTION_THRESHOLD)
 					{
-						rot_changed = TRUE;
+						rot_changed = true;
 					}
 					x_delta = dist_vec(LLVector3::x_axis * interp_rot, LLVector3::x_axis * test_rot);
 					y_delta = dist_vec(LLVector3::y_axis * interp_rot, LLVector3::y_axis * test_rot);
@@ -1202,9 +1202,9 @@ void LLBVHLoader::optimize()
 						// because it's significantly faster.
 						if (diff_max > 0)
 						{
-							if (ki_max->mIgnoreRot == TRUE)
+							if (ki_max->mIgnoreRot == true)
 							{
-								ki_max->mIgnoreRot = FALSE;
+								ki_max->mIgnoreRot = false;
 								joint->mNumRotKeys++;
 							}
 							diff_max = 0;
@@ -1213,7 +1213,7 @@ void LLBVHLoader::optimize()
 					else
 					{
 						// This keyframe isn't significant enough, throw it away.
-						ki_prev->mIgnoreRot = TRUE;
+						ki_prev->mIgnoreRot = true;
 						numRotFramesConsidered++;
 						// Store away the keyframe that has the largest deviation from the interpolated line, for insertion later.
 						if (rot_test > diff_max)
@@ -1232,7 +1232,7 @@ void LLBVHLoader::optimize()
 		if (!(pos_changed || rot_changed))
 		{
 			//LL_INFOS() << "Ignoring joint " << joint->mName << LL_ENDL;
-			joint->mIgnore = TRUE;
+			joint->mIgnore = true;
 		}
 	}
 }
@@ -1245,13 +1245,13 @@ void LLBVHLoader::reset()
 	mDuration = 0.0f;
 
 	mPriority = 2;
-	mLoop = FALSE;
+	mLoop = false;
 	mLoopInPoint = 0.f;
 	mLoopOutPoint = 0.f;
 	mEaseIn = 0.3f;
 	mEaseOut = 0.3f;
 	mHand = 1;
-	mInitialized = FALSE;
+	mInitialized = false;
 
 	mEmoteName = "";
 	mLineNumber = 0;
@@ -1262,7 +1262,7 @@ void LLBVHLoader::reset()
 //------------------------------------------------------------------------
 // LLBVHLoader::getLine()
 //------------------------------------------------------------------------
-BOOL LLBVHLoader::getLine(apr_file_t* fp)
+bool LLBVHLoader::getLine(apr_file_t* fp)
 {
 	if (apr_file_eof(fp) == APR_EOF)
 	{
@@ -1287,7 +1287,7 @@ U32 LLBVHLoader::getOutputSize()
 }
 
 // writes contents to datapacker
-BOOL LLBVHLoader::serialize(LLDataPacker& dp)
+bool LLBVHLoader::serialize(LLDataPacker& dp)
 {
 	F32 time;
 
diff --git a/indra/llcharacter/llbvhloader.h b/indra/llcharacter/llbvhloader.h
index 47fe409047..1cad8561c3 100644
--- a/indra/llcharacter/llbvhloader.h
+++ b/indra/llcharacter/llbvhloader.h
@@ -71,8 +71,8 @@ struct Key
 
 	F32	mPos[3];
 	F32	mRot[3];
-	BOOL	mIgnorePos;
-	BOOL	mIgnoreRot;
+	bool	mIgnorePos;
+	bool	mIgnoreRot;
 };
 
 
@@ -89,10 +89,10 @@ struct Joint
 	Joint(const char *name)
 	{
 		mName = name;
-		mIgnore = FALSE;
-		mIgnorePositions = FALSE;
-		mRelativePositionKey = FALSE;
-		mRelativeRotationKey = FALSE;
+		mIgnore = false;
+		mIgnorePositions = false;
+		mRelativePositionKey = false;
+		mRelativeRotationKey = false;
 		mOutName = name;
 		mOrder[0] = 'X';
 		mOrder[1] = 'Y';
@@ -111,10 +111,10 @@ struct Joint
 	LLVector3		mRelativePosition;
 	//
 	std::string		mName;
-	BOOL			mIgnore;
-	BOOL			mIgnorePositions;
-	BOOL			mRelativePositionKey;
-	BOOL			mRelativeRotationKey;
+	bool			mIgnore;
+	bool			mIgnorePositions;
+	bool			mRelativePositionKey;
+	bool			mRelativeRotationKey;
 	std::string		mOutName;
 	std::string		mMergeParentName;
 	std::string		mMergeChildName;
@@ -161,18 +161,18 @@ class Translation
 public:
 	Translation()
 	{
-		mIgnore = FALSE;
-		mIgnorePositions = FALSE;
-		mRelativePositionKey = FALSE;
-		mRelativeRotationKey = FALSE;
+		mIgnore = false;
+		mIgnorePositions = false;
+		mRelativePositionKey = false;
+		mRelativeRotationKey = false;
 		mPriorityModifier = 0;
 	}
 
 	std::string	mOutName;
-	BOOL		mIgnore;
-	BOOL		mIgnorePositions;
-	BOOL		mRelativePositionKey;
-	BOOL		mRelativeRotationKey;
+	bool		mIgnore;
+    bool		mIgnorePositions;
+    bool		mRelativePositionKey;
+    bool		mRelativeRotationKey;
 	LLMatrix3	mFrameMatrix;
 	LLMatrix3	mOffsetMatrix;
 	LLVector3	mRelativePosition;
@@ -293,7 +293,7 @@ public:
 	U32 getOutputSize();
 
 	// writes contents to datapacker
-	BOOL serialize(LLDataPacker& dp);
+	bool serialize(LLDataPacker& dp);
 
 	// flags redundant keyframe data
 	void optimize();
@@ -302,13 +302,13 @@ public:
 
 	F32 getDuration() { return mDuration; }
 
-	BOOL isInitialized() { return mInitialized; }
+	bool isInitialized() { return mInitialized; }
 
 	ELoadStatus getStatus() { return mStatus; }
 
 protected:
 	// Consumes one line of input from file.
-	BOOL getLine(apr_file_t *fp);
+	bool getLine(apr_file_t *fp);
 
 	// parser state
 	char		mLine[BVH_PARSER_LINE_SIZE];		/* Flawfinder: ignore */
@@ -322,7 +322,7 @@ protected:
 	TranslationMap		mTranslations;
 
 	S32					mPriority;
-	BOOL				mLoop;
+	bool				mLoop;
 	F32					mLoopInPoint;
 	F32					mLoopOutPoint;
 	F32					mEaseIn;
@@ -330,7 +330,7 @@ protected:
 	S32					mHand;
 	std::string			mEmoteName;
 
-	BOOL				mInitialized;
+	bool				mInitialized;
 	ELoadStatus			mStatus;
 
 	// computed values
diff --git a/indra/llcharacter/llcharacter.cpp b/indra/llcharacter/llcharacter.cpp
index b373bd75a3..abb0495b31 100644
--- a/indra/llcharacter/llcharacter.cpp
+++ b/indra/llcharacter/llcharacter.cpp
@@ -39,7 +39,7 @@
 LLStringTable LLCharacter::sVisualParamNames(1024);
 
 std::vector< LLCharacter* > LLCharacter::sInstances;
-BOOL LLCharacter::sAllowInstancesChange = TRUE ;
+bool LLCharacter::sAllowInstancesChange = true ;
 
 //-----------------------------------------------------------------------------
 // LLCharacter()
@@ -114,7 +114,7 @@ LLJoint *LLCharacter::getJoint( const std::string &name )
 //-----------------------------------------------------------------------------
 // registerMotion()
 //-----------------------------------------------------------------------------
-BOOL LLCharacter::registerMotion( const LLUUID& id, LLMotionConstructor create )
+bool LLCharacter::registerMotion( const LLUUID& id, LLMotionConstructor create )
 {
 	return mMotionController.registerMotion(id, create);
 }
@@ -147,7 +147,7 @@ LLMotion* LLCharacter::createMotion( const LLUUID &id )
 //-----------------------------------------------------------------------------
 // startMotion()
 //-----------------------------------------------------------------------------
-BOOL LLCharacter::startMotion(const LLUUID &id, F32 start_offset)
+bool LLCharacter::startMotion(const LLUUID &id, F32 start_offset)
 {
 	return mMotionController.startMotion(id, start_offset);
 }
@@ -156,7 +156,7 @@ BOOL LLCharacter::startMotion(const LLUUID &id, F32 start_offset)
 //-----------------------------------------------------------------------------
 // stopMotion()
 //-----------------------------------------------------------------------------
-BOOL LLCharacter::stopMotion(const LLUUID& id, BOOL stop_immediate)
+bool LLCharacter::stopMotion(const LLUUID& id, bool stop_immediate)
 {
 	return mMotionController.stopMotionLocally(id, stop_immediate);
 }
@@ -164,7 +164,7 @@ BOOL LLCharacter::stopMotion(const LLUUID& id, BOOL stop_immediate)
 //-----------------------------------------------------------------------------
 // isMotionActive()
 //-----------------------------------------------------------------------------
-BOOL LLCharacter::isMotionActive(const LLUUID& id)
+bool LLCharacter::isMotionActive(const LLUUID& id)
 {
 	LLMotion *motionp = mMotionController.findMotion(id);
 	if (motionp)
@@ -279,7 +279,7 @@ void LLCharacter::removeAnimationData(std::string name)
 //-----------------------------------------------------------------------------
 // setVisualParamWeight()
 //-----------------------------------------------------------------------------
-BOOL LLCharacter::setVisualParamWeight(const LLVisualParam* which_param, F32 weight)
+bool LLCharacter::setVisualParamWeight(const LLVisualParam* which_param, F32 weight)
 {
 	S32 index = which_param->getID();
 	visual_param_index_map_t::iterator index_iter = mVisualParamIndexMap.find(index);
@@ -294,7 +294,7 @@ BOOL LLCharacter::setVisualParamWeight(const LLVisualParam* which_param, F32 wei
 //-----------------------------------------------------------------------------
 // setVisualParamWeight()
 //-----------------------------------------------------------------------------
-BOOL LLCharacter::setVisualParamWeight(const char* param_name, F32 weight)
+bool LLCharacter::setVisualParamWeight(const char* param_name, F32 weight)
 {
 	std::string tname(param_name);
 	LLStringUtil::toLower(tname);
@@ -312,7 +312,7 @@ BOOL LLCharacter::setVisualParamWeight(const char* param_name, F32 weight)
 //-----------------------------------------------------------------------------
 // setVisualParamWeight()
 //-----------------------------------------------------------------------------
-BOOL LLCharacter::setVisualParamWeight(S32 index, F32 weight)
+bool LLCharacter::setVisualParamWeight(S32 index, F32 weight)
 {
 	visual_param_index_map_t::iterator index_iter = mVisualParamIndexMap.find(index);
 	if (index_iter != mVisualParamIndexMap.end())
diff --git a/indra/llcharacter/llcharacter.h b/indra/llcharacter/llcharacter.h
index 6d56d59e8c..d134c1cb5b 100644
--- a/indra/llcharacter/llcharacter.h
+++ b/indra/llcharacter/llcharacter.h
@@ -125,7 +125,7 @@ public:
 	//-------------------------------------------------------------------------
 	// registers a motion with the character
 	// returns true if successfull
-	BOOL registerMotion( const LLUUID& id, LLMotionConstructor create );
+	bool registerMotion( const LLUUID& id, LLMotionConstructor create );
 
 	void removeMotion( const LLUUID& id );
 
@@ -137,13 +137,13 @@ public:
 	
 	// start a motion
 	// returns true if successful, false if an error occurred
-	virtual BOOL startMotion( const LLUUID& id, F32 start_offset = 0.f);
+	virtual bool startMotion( const LLUUID& id, F32 start_offset = 0.f);
 
 	// stop a motion
-	virtual BOOL stopMotion( const LLUUID& id, BOOL stop_immediate = FALSE );
+	virtual bool stopMotion( const LLUUID& id, bool stop_immediate = false );
 
 	// is this motion active?
-	BOOL isMotionActive( const LLUUID& id );
+	bool isMotionActive( const LLUUID& id );
 
 	// Event handler for motion deactivation.
 	// Called when a motion has completely stopped and has been deactivated.
@@ -156,7 +156,7 @@ public:
 	void updateMotions(e_update_t update_type);
 
 	LLAnimPauseRequest requestPause();
-	BOOL areAnimationsPaused() const { return mMotionController.isPaused(); }
+	bool areAnimationsPaused() const { return mMotionController.isPaused(); }
 	void setAnimTimeFactor(F32 factor) { mMotionController.setTimeFactor(factor); }
 	void setTimeStep(F32 time_step) { mMotionController.setTimeStep(time_step); }
 
@@ -190,9 +190,9 @@ public:
 	void addVisualParam(LLVisualParam *param);
 	void addSharedVisualParam(LLVisualParam *param);
 
-	virtual BOOL setVisualParamWeight(const LLVisualParam *which_param, F32 weight);
-	virtual BOOL setVisualParamWeight(const char* param_name, F32 weight);
-	virtual BOOL setVisualParamWeight(S32 index, F32 weight);
+	virtual bool setVisualParamWeight(const LLVisualParam *which_param, F32 weight);
+	virtual bool setVisualParamWeight(const char* param_name, F32 weight);
+	virtual bool setVisualParamWeight(S32 index, F32 weight);
 
 	// get visual param weight by param or name
 	F32 getVisualParamWeight(LLVisualParam *distortion);
@@ -256,7 +256,7 @@ public:
 	void			setSkeletonSerialNum( U32 num )	{ mSkeletonSerialNum = num; }
 
 	static std::vector< LLCharacter* > sInstances;
-	static BOOL sAllowInstancesChange ; //debug use
+	static bool sAllowInstancesChange ; //debug use
 
 	virtual void	setHoverOffset(const LLVector3& hover_offset, bool send_update=true) { mHoverOffset = hover_offset; }
 	const LLVector3& getHoverOffset() const { return mHoverOffset; }
diff --git a/indra/llcharacter/lleditingmotion.cpp b/indra/llcharacter/lleditingmotion.cpp
index cf6438aad9..0eed1ab39e 100644
--- a/indra/llcharacter/lleditingmotion.cpp
+++ b/indra/llcharacter/lleditingmotion.cpp
@@ -141,7 +141,7 @@ LLMotion::LLMotionInitStatus LLEditingMotion::onInitialize(LLCharacter *characte
 //-----------------------------------------------------------------------------
 // LLEditingMotion::onActivate()
 //-----------------------------------------------------------------------------
-BOOL LLEditingMotion::onActivate()
+bool LLEditingMotion::onActivate()
 {
 	// propagate joint positions to kinematic chain
     // SL-315
@@ -161,14 +161,14 @@ BOOL LLEditingMotion::onActivate()
 //-----------------------------------------------------------------------------
 // LLEditingMotion::onUpdate()
 //-----------------------------------------------------------------------------
-BOOL LLEditingMotion::onUpdate(F32 time, U8* joint_mask)
+bool LLEditingMotion::onUpdate(F32 time, U8* joint_mask)
 {
     LL_PROFILE_ZONE_SCOPED;
 	LLVector3 focus_pt;
 	LLVector3* pointAtPt = (LLVector3*)mCharacter->getAnimationData("PointAtPoint");
 
 
-	BOOL result = true;
+	bool result = true;
 
 	if (!pointAtPt)
 	{
diff --git a/indra/llcharacter/lleditingmotion.h b/indra/llcharacter/lleditingmotion.h
index 63295983e0..de78c47da6 100644
--- a/indra/llcharacter/lleditingmotion.h
+++ b/indra/llcharacter/lleditingmotion.h
@@ -94,14 +94,14 @@ public:
 	virtual LLMotionInitStatus onInitialize(LLCharacter *character);
 
 	// called when a motion is activated
-	// must return TRUE to indicate success, or else
+	// must return true to indicate success, or else
 	// it will be deactivated
-	virtual BOOL onActivate();
+	virtual bool onActivate();
 
 	// called per time step
-	// must return TRUE while it is active, and
-	// must return FALSE when the motion is completed.
-	virtual BOOL onUpdate(F32 time, U8* joint_mask);
+	// must return true while it is active, and
+	// must return false when the motion is completed.
+	virtual bool onUpdate(F32 time, U8* joint_mask);
 
 	// called when a motion is deactivated
 	virtual void onDeactivate();
diff --git a/indra/llcharacter/llgesture.cpp b/indra/llcharacter/llgesture.cpp
index d0c4139da7..b36b83e75e 100644
--- a/indra/llcharacter/llgesture.cpp
+++ b/indra/llcharacter/llgesture.cpp
@@ -91,14 +91,14 @@ const LLGesture &LLGesture::operator =(const LLGesture &rhs)
 }
 
 
-BOOL LLGesture::trigger(KEY key, MASK mask)
+bool LLGesture::trigger(KEY key, MASK mask)
 {
 	LL_WARNS() << "Parent class trigger called: you probably didn't mean this." << LL_ENDL;
 	return false;
 }
 
 
-BOOL LLGesture::trigger(const std::string& trigger_string)
+bool LLGesture::trigger(const std::string& trigger_string)
 {
 	LL_WARNS() << "Parent class trigger called: you probably didn't mean this." << LL_ENDL;
 	return false;
@@ -189,12 +189,12 @@ void LLGestureList::deleteAll()
 // Iterates through space delimited tokens in string, triggering any gestures found.
 // Generates a revised string that has the found tokens replaced by their replacement strings
 // and (as a minor side effect) has multiple spaces in a row replaced by single spaces.
-BOOL LLGestureList::triggerAndReviseString(const std::string &string, std::string* revised_string)
+bool LLGestureList::triggerAndReviseString(const std::string &string, std::string* revised_string)
 {
 	std::string tokenized = string;
 
-	BOOL found_gestures = FALSE;
-	BOOL first_token = TRUE;
+	bool found_gestures = false;
+	bool first_token = true;
 
 	typedef boost::tokenizer<boost::char_separator<char> > tokenizer;
 	boost::char_separator<char> sep(" ");
@@ -235,7 +235,7 @@ BOOL LLGestureList::triggerAndReviseString(const std::string &string, std::strin
 						}
 
 					}
-					found_gestures = TRUE;
+					found_gestures = true;
 					break;
 				}
 				gesture = NULL;
@@ -251,14 +251,14 @@ BOOL LLGestureList::triggerAndReviseString(const std::string &string, std::strin
 			revised_string->append( cur_token );
 		}
 
-		first_token = FALSE;
+		first_token = false;
 	}
 	return found_gestures;
 }
 
 
 
-BOOL LLGestureList::trigger(KEY key, MASK mask)
+bool LLGestureList::trigger(KEY key, MASK mask)
 {
 	for (U32 i = 0; i < mList.size(); i++)
 	{
diff --git a/indra/llcharacter/llgesture.h b/indra/llcharacter/llgesture.h
index cfb489f727..22db9bc565 100644
--- a/indra/llcharacter/llgesture.h
+++ b/indra/llcharacter/llgesture.h
@@ -55,10 +55,10 @@ public:
 	const std::string&	getOutputString() const	{ return mOutputString; }
 
 	// Triggers if a key/mask matches it
-	virtual BOOL trigger(KEY key, MASK mask);
+	virtual bool trigger(KEY key, MASK mask);
 
 	// Triggers if case-insensitive substring matches (assumes string is lowercase)
-	virtual BOOL trigger(const std::string &string);
+	virtual bool trigger(const std::string &string);
 
 	// non-endian-neutral serialization
 	U8 *serialize(U8 *buffer) const;
@@ -84,10 +84,10 @@ public:
 	virtual ~LLGestureList();
 
 	// Triggers if a key/mask matches one in the list
-	BOOL trigger(KEY key, MASK mask);
+	bool trigger(KEY key, MASK mask);
 
 	// Triggers if substring matches and generates revised string.
-	BOOL triggerAndReviseString(const std::string &string, std::string* revised_string);
+	bool triggerAndReviseString(const std::string &string, std::string* revised_string);
 
 	// Used for construction from UI
 	S32 count() const						{ return mList.size(); }
diff --git a/indra/llcharacter/llhandmotion.cpp b/indra/llcharacter/llhandmotion.cpp
index 1aad9565fc..f74c8aa70c 100644
--- a/indra/llcharacter/llhandmotion.cpp
+++ b/indra/llcharacter/llhandmotion.cpp
@@ -98,7 +98,7 @@ LLMotion::LLMotionInitStatus LLHandMotion::onInitialize(LLCharacter *character)
 //-----------------------------------------------------------------------------
 // LLHandMotion::onActivate()
 //-----------------------------------------------------------------------------
-BOOL LLHandMotion::onActivate()
+bool LLHandMotion::onActivate()
 {
 	LLPolyMesh *upperBodyMesh = mCharacter->getUpperBodyMesh();
 
@@ -119,7 +119,7 @@ BOOL LLHandMotion::onActivate()
 //-----------------------------------------------------------------------------
 // LLHandMotion::onUpdate()
 //-----------------------------------------------------------------------------
-BOOL LLHandMotion::onUpdate(F32 time, U8* joint_mask)
+bool LLHandMotion::onUpdate(F32 time, U8* joint_mask)
 {
     LL_PROFILE_ZONE_SCOPED;
 	eHandPose *requestedHandPose;
diff --git a/indra/llcharacter/llhandmotion.h b/indra/llcharacter/llhandmotion.h
index a37e50f595..828b4851be 100644
--- a/indra/llcharacter/llhandmotion.h
+++ b/indra/llcharacter/llhandmotion.h
@@ -107,14 +107,14 @@ public:
 	virtual LLMotionInitStatus onInitialize(LLCharacter *character);
 
 	// called when a motion is activated
-	// must return TRUE to indicate success, or else
-	// it will be deactivated 
-	virtual BOOL onActivate();
+	// must return true to indicate success, or else
+	// it will be deactivated
+	virtual bool onActivate();
 
 	// called per time step
-	// must return TRUE while it is active, and
-	// must return FALSE when the motion is completed.
-	virtual BOOL onUpdate(F32 time, U8* joint_mask);
+	// must return true while it is active, and
+	// must return false when the motion is completed.
+	virtual bool onUpdate(F32 time, U8* joint_mask);
 
 	// called when a motion is deactivated
 	virtual void onDeactivate();
diff --git a/indra/llcharacter/llheadrotmotion.cpp b/indra/llcharacter/llheadrotmotion.cpp
index 85d7611b2c..b327deca64 100644
--- a/indra/llcharacter/llheadrotmotion.cpp
+++ b/indra/llcharacter/llheadrotmotion.cpp
@@ -164,7 +164,7 @@ LLMotion::LLMotionInitStatus LLHeadRotMotion::onInitialize(LLCharacter *characte
 //-----------------------------------------------------------------------------
 // LLHeadRotMotion::onActivate()
 //-----------------------------------------------------------------------------
-BOOL LLHeadRotMotion::onActivate()
+bool LLHeadRotMotion::onActivate()
 {
 	return true;
 }
@@ -173,7 +173,7 @@ BOOL LLHeadRotMotion::onActivate()
 //-----------------------------------------------------------------------------
 // LLHeadRotMotion::onUpdate()
 //-----------------------------------------------------------------------------
-BOOL LLHeadRotMotion::onUpdate(F32 time, U8* joint_mask)
+bool LLHeadRotMotion::onUpdate(F32 time, U8* joint_mask)
 {
     LL_PROFILE_ZONE_SCOPED_CATEGORY_AVATAR;
 	LLQuaternion	targetHeadRotWorld;
@@ -279,7 +279,7 @@ LLEyeMotion::LLEyeMotion(const LLUUID &id) : LLMotion(id)
 	mEyeLookAwayPitch = 0.f;
 
 	mEyeBlinkTime = 0.f;
-	mEyesClosed = FALSE;
+	mEyesClosed = false;
 	
 	mHeadJoint = NULL;
 
@@ -362,7 +362,7 @@ LLMotion::LLMotionInitStatus LLEyeMotion::onInitialize(LLCharacter *character)
 //-----------------------------------------------------------------------------
 // LLEyeMotion::onActivate()
 //-----------------------------------------------------------------------------
-BOOL LLEyeMotion::onActivate()
+bool LLEyeMotion::onActivate()
 {
 	return true;
 }
@@ -373,7 +373,7 @@ BOOL LLEyeMotion::onActivate()
 void LLEyeMotion::adjustEyeTarget(LLVector3* targetPos, LLJointState& left_eye_state, LLJointState& right_eye_state)
 {
 	// Compute eye rotation.
-	BOOL has_eye_target = FALSE;
+	bool has_eye_target = false;
 	LLQuaternion	target_eye_rot;
 	LLVector3		eye_look_at;
 	F32				vergence;
@@ -385,7 +385,7 @@ void LLEyeMotion::adjustEyeTarget(LLVector3* targetPos, LLJointState& left_eye_s
 		LLVector3		up;
 
 		eye_look_at = *targetPos;
-		has_eye_target = TRUE;
+		has_eye_target = true;
 		F32 lookAtDistance = eye_look_at.normVec();
 
 		left.setVec(skyward % eye_look_at);
@@ -457,7 +457,7 @@ void LLEyeMotion::adjustEyeTarget(LLVector3* targetPos, LLJointState& left_eye_s
 //-----------------------------------------------------------------------------
 // LLEyeMotion::onUpdate()
 //-----------------------------------------------------------------------------
-BOOL LLEyeMotion::onUpdate(F32 time, U8* joint_mask)
+bool LLEyeMotion::onUpdate(F32 time, U8* joint_mask)
 {
     LL_PROFILE_ZONE_SCOPED_CATEGORY_AVATAR;
 	//calculate jitter
@@ -505,7 +505,7 @@ BOOL LLEyeMotion::onUpdate(F32 time, U8* joint_mask)
 
 		if (rightEyeBlinkMorph == 1.f)
 		{
-			mEyesClosed = TRUE;
+			mEyesClosed = true;
 			mEyeBlinkTime = EYE_BLINK_CLOSE_TIME;
 			mEyeBlinkTimer.reset();
 		}
@@ -525,7 +525,7 @@ BOOL LLEyeMotion::onUpdate(F32 time, U8* joint_mask)
 
 			if (rightEyeBlinkMorph == 0.f)
 			{
-				mEyesClosed = FALSE;
+				mEyesClosed = false;
 				mEyeBlinkTime = EYE_BLINK_MIN_TIME + ll_frand(EYE_BLINK_MAX_TIME - EYE_BLINK_MIN_TIME);
 				mEyeBlinkTimer.reset();
 			}
diff --git a/indra/llcharacter/llheadrotmotion.h b/indra/llcharacter/llheadrotmotion.h
index fbc0885039..6bab1e8795 100644
--- a/indra/llcharacter/llheadrotmotion.h
+++ b/indra/llcharacter/llheadrotmotion.h
@@ -89,14 +89,14 @@ public:
 	virtual LLMotionInitStatus onInitialize(LLCharacter *character);
 
 	// called when a motion is activated
-	// must return TRUE to indicate success, or else
+	// must return true to indicate success, or else
 	// it will be deactivated
-	virtual BOOL onActivate();
+	virtual bool onActivate();
 
 	// called per time step
-	// must return TRUE while it is active, and
-	// must return FALSE when the motion is completed.
-	virtual BOOL onUpdate(F32 time, U8* joint_mask);
+	// must return true while it is active, and
+	// must return false when the motion is completed.
+	virtual bool onUpdate(F32 time, U8* joint_mask);
 
 	// called when a motion is deactivated
 	virtual void onDeactivate();
@@ -172,16 +172,16 @@ public:
 	virtual LLMotionInitStatus onInitialize(LLCharacter *character);
 
 	// called when a motion is activated
-	// must return TRUE to indicate success, or else
+	// must return true to indicate success, or else
 	// it will be deactivated
-	virtual BOOL onActivate();
+	virtual bool onActivate();
 
     void adjustEyeTarget(LLVector3* targetPos, LLJointState& left_eye_state, LLJointState& right_eye_state);
 
 	// called per time step
-	// must return TRUE while it is active, and
-	// must return FALSE when the motion is completed.
-	virtual BOOL onUpdate(F32 time, U8* joint_mask);
+	// must return true while it is active, and
+	// must return false when the motion is completed.
+	virtual bool onUpdate(F32 time, U8* joint_mask);
 
 	// called when a motion is deactivated
 	virtual void onDeactivate();
@@ -209,7 +209,7 @@ public:
 	// eye blinking
 	LLFrameTimer		mEyeBlinkTimer;
 	F32					mEyeBlinkTime;
-	BOOL				mEyesClosed;
+	bool				mEyesClosed;
 };
 
 #endif // LL_LLHEADROTMOTION_H
diff --git a/indra/llcharacter/lljoint.cpp b/indra/llcharacter/lljoint.cpp
index 06f3bedf85..3597f3b63f 100644
--- a/indra/llcharacter/lljoint.cpp
+++ b/indra/llcharacter/lljoint.cpp
@@ -105,10 +105,10 @@ void LLJoint::init()
 {
 	mName = "unnamed";
 	mParent = NULL;
-	mXform.setScaleChildOffset(TRUE);
+	mXform.setScaleChildOffset(true);
 	mXform.setScale(LLVector3(1.0f, 1.0f, 1.0f));
 	mDirtyFlags = MATRIX_DIRTY | ROTATION_DIRTY | POSITION_DIRTY;
-	mUpdateXform = TRUE;
+	mUpdateXform = true;
     mSupport = SUPPORT_BASE;
     mEnd = LLVector3(0.0f, 0.0f, 0.0f);
 }
@@ -135,7 +135,7 @@ LLJoint::LLJoint(const std::string &name, LLJoint *parent) :
 	mJointNum(-2)
 {
 	init();
-	mUpdateXform = FALSE;
+	mUpdateXform = false;
 
 	setName(name);
 	if (parent)
@@ -996,7 +996,7 @@ void LLJoint::updateWorldMatrix()
 	if (mDirtyFlags & MATRIX_DIRTY)
 	{
 		sNumUpdates++;
-		mXform.updateMatrix(FALSE);
+		mXform.updateMatrix(false);
         mWorldMatrix.loadu(mXform.getWorldMatrix());
 		mDirtyFlags = 0x0;
 	}
diff --git a/indra/llcharacter/lljoint.h b/indra/llcharacter/lljoint.h
index 61ac6b4432..f0bfb3ba89 100644
--- a/indra/llcharacter/lljoint.h
+++ b/indra/llcharacter/lljoint.h
@@ -133,7 +133,7 @@ protected:
     
 public:
 	U32				mDirtyFlags;
-	BOOL			mUpdateXform;
+	bool			mUpdateXform;
 
 	// describes the skin binding pose
 	LLVector3		mSkinOffset;
@@ -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/lljointsolverrp3.cpp b/indra/llcharacter/lljointsolverrp3.cpp
index f3d5e2e324..4b5d1c8894 100644
--- a/indra/llcharacter/lljointsolverrp3.cpp
+++ b/indra/llcharacter/lljointsolverrp3.cpp
@@ -53,9 +53,9 @@ LLJointSolverRP3::LLJointSolverRP3()
 	mLengthAB = 1.0f;
 	mLengthBC = 1.0f;
 	mPoleVector.setVec( 1.0f, 0.0f, 0.0f );
-	mbUseBAxis = FALSE;
+	mbUseBAxis = false;
 	mTwist = 0.0f;
-	mFirstTime = TRUE;
+	mFirstTime = true;
 }
 
 
@@ -114,7 +114,7 @@ void LLJointSolverRP3::setBAxis( const LLVector3& bAxis )
 {
 	mBAxis = bAxis;
 	mBAxis.normVec();
-	mbUseBAxis = TRUE;
+	mbUseBAxis = true;
 }
 
 //-----------------------------------------------------------------------------
diff --git a/indra/llcharacter/lljointsolverrp3.h b/indra/llcharacter/lljointsolverrp3.h
index 88b5d08710..4eb814ee2b 100644
--- a/indra/llcharacter/lljointsolverrp3.h
+++ b/indra/llcharacter/lljointsolverrp3.h
@@ -97,11 +97,11 @@ protected:
 
 	LLVector3	mPoleVector;
 	LLVector3	mBAxis;
-	BOOL		mbUseBAxis;
+	bool		mbUseBAxis;
 
 	F32			mTwist;
 
-	BOOL		mFirstTime;
+	bool		mFirstTime;
 	LLMatrix4	mSavedJointAMat;
 	LLMatrix4	mSavedInvPlaneMat;
 
diff --git a/indra/llcharacter/lljointstate.h b/indra/llcharacter/lljointstate.h
index 1ccc6b5093..c01ec96450 100644
--- a/indra/llcharacter/lljointstate.h
+++ b/indra/llcharacter/lljointstate.h
@@ -80,7 +80,7 @@ public:
 	// joint that this state is applied to
 	LLJoint* getJoint()				{ return mJoint; }
 	const LLJoint* getJoint() const	{ return mJoint; }
-	BOOL setJoint( LLJoint *joint )	{ mJoint = joint; return mJoint != NULL; }
+	bool setJoint( LLJoint *joint )	{ mJoint = joint; return mJoint != NULL; }
 
 	// transform type (bitwise flags can be combined)
 	// Note that these are set automatically when various
diff --git a/indra/llcharacter/llkeyframefallmotion.cpp b/indra/llcharacter/llkeyframefallmotion.cpp
index e8bb2bf95d..ed6dd69362 100644
--- a/indra/llcharacter/llkeyframefallmotion.cpp
+++ b/indra/llcharacter/llkeyframefallmotion.cpp
@@ -91,7 +91,7 @@ LLMotion::LLMotionInitStatus LLKeyframeFallMotion::onInitialize(LLCharacter *cha
 //-----------------------------------------------------------------------------
 // LLKeyframeFallMotion::onActivate()
 //-----------------------------------------------------------------------------
-BOOL LLKeyframeFallMotion::onActivate()
+bool LLKeyframeFallMotion::onActivate()
 {
 	LLVector3 ground_pos;
 	LLVector3 ground_normal;
@@ -119,10 +119,10 @@ BOOL LLKeyframeFallMotion::onActivate()
 //-----------------------------------------------------------------------------
 // LLKeyframeFallMotion::onUpdate()
 //-----------------------------------------------------------------------------
-BOOL LLKeyframeFallMotion::onUpdate(F32 activeTime, U8* joint_mask)
+bool LLKeyframeFallMotion::onUpdate(F32 activeTime, U8* joint_mask)
 {
     LL_PROFILE_ZONE_SCOPED_CATEGORY_AVATAR;
-	BOOL result = LLKeyframeMotion::onUpdate(activeTime, joint_mask);
+	bool result = LLKeyframeMotion::onUpdate(activeTime, joint_mask);
 	F32  slerp_amt = clamp_rescale(activeTime / getDuration(), 0.5f, 0.75f, 0.f, 1.f);
 
 	if (mPelvisState.notNull())
diff --git a/indra/llcharacter/llkeyframefallmotion.h b/indra/llcharacter/llkeyframefallmotion.h
index 7f0a2fdda2..1ca1ed4dec 100644
--- a/indra/llcharacter/llkeyframefallmotion.h
+++ b/indra/llcharacter/llkeyframefallmotion.h
@@ -60,9 +60,9 @@ public:
 	// animation callbacks to be implemented by subclasses
 	//-------------------------------------------------------------------------
 	virtual LLMotionInitStatus onInitialize(LLCharacter *character);
-	virtual BOOL onActivate();
+	virtual bool onActivate();
 	virtual F32 getEaseInDuration();
-	virtual BOOL onUpdate(F32 activeTime, U8* joint_mask);
+	virtual bool onUpdate(F32 activeTime, U8* joint_mask);
 
 protected:
 	//-------------------------------------------------------------------------
diff --git a/indra/llcharacter/llkeyframemotion.cpp b/indra/llcharacter/llkeyframemotion.cpp
index 0c2893cf4d..ba6cc025be 100644
--- a/indra/llcharacter/llkeyframemotion.cpp
+++ b/indra/llcharacter/llkeyframemotion.cpp
@@ -66,7 +66,7 @@ static F32 MAX_CONSTRAINTS = 10;
 //-----------------------------------------------------------------------------
 LLKeyframeMotion::JointMotionList::JointMotionList()
 	: mDuration(0.f),
-	  mLoop(FALSE),
+	  mLoop(false),
 	  mLoopInPoint(0.f),
 	  mLoopOutPoint(0.f),
 	  mEaseInDuration(0.f),
@@ -505,7 +505,7 @@ LLMotion::LLMotionInitStatus LLKeyframeMotion::onInitialize(LLCharacter *charact
                                         LLAssetType::AT_ANIMATION,
                                         onLoadComplete,
                                         (void*)character_id,
-                                        FALSE);
+                                        false);
         }
         else
         {
@@ -565,7 +565,7 @@ LLMotion::LLMotionInitStatus LLKeyframeMotion::onInitialize(LLCharacter *charact
 	U8 *anim_data;
 	S32 anim_file_size;
 
-	BOOL success = FALSE;
+	bool success = false;
 	LLFileSystem* anim_file = new LLFileSystem(mID, LLAssetType::AT_ANIMATION);
 	if (!anim_file || !anim_file->getSize())
 	{
@@ -620,7 +620,7 @@ LLMotion::LLMotionInitStatus LLKeyframeMotion::onInitialize(LLCharacter *charact
 //-----------------------------------------------------------------------------
 // setupPose()
 //-----------------------------------------------------------------------------
-BOOL LLKeyframeMotion::setupPose()
+bool LLKeyframeMotion::setupPose()
 {
 	// add all valid joint states to the pose
 	for (U32 jm=0; jm<mJointMotionList->getNumJointMotions(); jm++)
@@ -659,7 +659,7 @@ BOOL LLKeyframeMotion::setupPose()
 //-----------------------------------------------------------------------------
 // LLKeyframeMotion::onActivate()
 //-----------------------------------------------------------------------------
-BOOL LLKeyframeMotion::onActivate()
+bool LLKeyframeMotion::onActivate()
 {
 	// If the keyframe anim has an associated emote, trigger it. 
 	if( mJointMotionList->mEmoteName.length() > 0 )
@@ -680,7 +680,7 @@ BOOL LLKeyframeMotion::onActivate()
 //-----------------------------------------------------------------------------
 // LLKeyframeMotion::onUpdate()
 //-----------------------------------------------------------------------------
-BOOL LLKeyframeMotion::onUpdate(F32 time, U8* joint_mask)
+bool LLKeyframeMotion::onUpdate(F32 time, U8* joint_mask)
 {
     LL_PROFILE_ZONE_SCOPED_CATEGORY_AVATAR;
 	// llassert(time >= 0.f);		// This will fire
@@ -869,7 +869,7 @@ void LLKeyframeMotion::initializeConstraint(JointConstraint* constraint)
 void LLKeyframeMotion::activateConstraint(JointConstraint* constraint)
 {
 	JointConstraintSharedData *shared_data = constraint->mSharedData;
-	constraint->mActive = TRUE;
+	constraint->mActive = true;
 	S32 joint_num;
 
 	// grab ground position if we need to
@@ -901,17 +901,17 @@ void LLKeyframeMotion::deactivateConstraint(JointConstraint *constraintp)
 {
 	if (constraintp->mSourceVolume)
 	{
-		constraintp->mSourceVolume->mUpdateXform = FALSE;
+		constraintp->mSourceVolume->mUpdateXform = false;
 	}
 
 	if (constraintp->mSharedData->mConstraintTargetType != CONSTRAINT_TARGET_TYPE_GROUND)
 	{
 		if (constraintp->mTargetVolume)
 		{
-			constraintp->mTargetVolume->mUpdateXform = FALSE;
+			constraintp->mTargetVolume->mUpdateXform = false;
 		}
 	}
-	constraintp->mActive = FALSE;
+	constraintp->mActive = false;
 }
 
 //-----------------------------------------------------------------------------
@@ -1088,9 +1088,9 @@ void LLKeyframeMotion::applyConstraint(JointConstraint* constraint, F32 time, U8
 			// convert intermediate joint positions to world coordinates
 			positions[joint_num] = ( constraint->mPositions[joint_num] * mPelvisp->getWorldRotation()) + mPelvisp->getWorldPosition();
 			F32 time_constant = 1.f / clamp_rescale(constraint->mFixupDistanceRMS, 0.f, 0.5f, 0.2f, 8.f);
-//			LL_INFOS() << "Interpolant " << LLSmoothInterpolation::getInterpolant(time_constant, FALSE) << " and fixup distance " << constraint->mFixupDistanceRMS << " on " << mCharacter->findCollisionVolume(shared_data->mSourceConstraintVolume)->getName() << LL_ENDL;
-			positions[joint_num] = lerp(positions[joint_num], kinematic_position, 
-				LLSmoothInterpolation::getInterpolant(time_constant, FALSE));
+//			LL_INFOS() << "Interpolant " << LLSmoothInterpolation::getInterpolant(time_constant, false) << " and fixup distance " << constraint->mFixupDistanceRMS << " on " << mCharacter->findCollisionVolume(shared_data->mSourceConstraintVolume)->getName() << LL_ENDL;
+			positions[joint_num] = lerp(positions[joint_num], kinematic_position,
+				LLSmoothInterpolation::getInterpolant(time_constant, false));
 		}
 
 		S32 iteration_count;
@@ -1225,9 +1225,9 @@ void LLKeyframeMotion::applyConstraint(JointConstraint* constraint, F32 time, U8
 // allow_invalid_joints should be true when handling existing content, to avoid breakage.
 // During upload, we should be more restrictive and reject such animations.
 //-----------------------------------------------------------------------------
-BOOL LLKeyframeMotion::deserialize(LLDataPacker& dp, const LLUUID& asset_id, bool allow_invalid_joints)
+bool LLKeyframeMotion::deserialize(LLDataPacker& dp, const LLUUID& asset_id, bool allow_invalid_joints)
 {
-	BOOL old_version = FALSE;
+	bool old_version = false;
 	std::unique_ptr<LLKeyframeMotion::JointMotionList> joint_motion_list(new LLKeyframeMotion::JointMotionList);
 
 	//-------------------------------------------------------------------------
@@ -1251,7 +1251,7 @@ BOOL LLKeyframeMotion::deserialize(LLDataPacker& dp, const LLUUID& asset_id, boo
 
 	if (version == 0 && sub_version == 1)
 	{
-		old_version = TRUE;
+		old_version = true;
 	}
 	else if (version != KEYFRAME_MOTION_VERSION || sub_version != KEYFRAME_MOTION_SUBVERSION)
 	{
@@ -1352,7 +1352,7 @@ BOOL LLKeyframeMotion::deserialize(LLDataPacker& dp, const LLUUID& asset_id, boo
 	if (female_land_anim == asset_id || formal_female_land_anim == asset_id)
 	{
 		LL_WARNS() << "Animation(" << asset_id << ") won't be looped." << LL_ENDL;
-		joint_motion_list->mLoop = FALSE;
+		joint_motion_list->mLoop = false;
 	}
 
 	//-------------------------------------------------------------------------
@@ -1656,7 +1656,7 @@ BOOL LLKeyframeMotion::deserialize(LLDataPacker& dp, const LLUUID& asset_id, boo
 		// scan position curve keys
 		//---------------------------------------------------------------------
 		PositionCurve *pCurve = &joint_motion->mPositionCurve;
-		BOOL is_pelvis = joint_motion->mJointName == "mPelvis";
+		bool is_pelvis = joint_motion->mJointName == "mPelvis";
 		for (S32 k = 0; k < joint_motion->mPositionCurve.mNumKeys; k++)
 		{
 			U16 time_short;
@@ -1903,7 +1903,7 @@ BOOL LLKeyframeMotion::deserialize(LLDataPacker& dp, const LLUUID& asset_id, boo
 
 			if (!constraintp->mTargetConstraintDir.isExactlyZero())
 			{
-				constraintp->mUseTargetOffset = TRUE;
+				constraintp->mUseTargetOffset = true;
 	//			constraintp->mTargetConstraintDir *= constraintp->mSourceConstraintOffset.magVec();
 			}
 
@@ -1998,9 +1998,9 @@ BOOL LLKeyframeMotion::deserialize(LLDataPacker& dp, const LLUUID& asset_id, boo
 //-----------------------------------------------------------------------------
 // serialize()
 //-----------------------------------------------------------------------------
-BOOL LLKeyframeMotion::serialize(LLDataPacker& dp) const
+bool LLKeyframeMotion::serialize(LLDataPacker& dp) const
 {
-	BOOL success = true;
+	bool success = true;
 
 	LL_DEBUGS("BVH") << "serializing" << LL_ENDL;
 
@@ -2283,7 +2283,7 @@ void LLKeyframeMotion::flushKeyframeCache()
 //-----------------------------------------------------------------------------
 // setLoop()
 //-----------------------------------------------------------------------------
-void LLKeyframeMotion::setLoop(BOOL loop)
+void LLKeyframeMotion::setLoop(bool loop)
 {
 	if (mJointMotionList) 
 	{
@@ -2515,7 +2515,7 @@ LLKeyframeMotion::JointConstraint::JointConstraint(JointConstraintSharedData* sh
 {
 	mWeight = 0.f;
 	mTotalLength = 0.f;
-	mActive = FALSE;
+	mActive = false;
 	mSourceVolume = NULL;
 	mTargetVolume = NULL;
 	mFixupDistanceRMS = 0.f;
diff --git a/indra/llcharacter/llkeyframemotion.h b/indra/llcharacter/llkeyframemotion.h
index 59a1d39a62..56c4364fd8 100644
--- a/indra/llcharacter/llkeyframemotion.h
+++ b/indra/llcharacter/llkeyframemotion.h
@@ -135,14 +135,14 @@ public:
 	virtual LLMotionInitStatus onInitialize(LLCharacter *character);
 
 	// called when a motion is activated
-	// must return TRUE to indicate success, or else
+	// must return true to indicate success, or else
 	// it will be deactivated
-	virtual BOOL onActivate();
+	virtual bool onActivate();
 
 	// called per time step
-	// must return TRUE while it is active, and
-	// must return FALSE when the motion is completed.
-	virtual BOOL onUpdate(F32 time, U8* joint_mask);
+	// must return true while it is active, and
+	// must return false when the motion is completed.
+	virtual bool onUpdate(F32 time, U8* joint_mask);
 
 	// called when a motion is deactivated
 	virtual void onDeactivate();
@@ -155,14 +155,14 @@ public:
 
 public:
 	U32		getFileSize();
-	BOOL	serialize(LLDataPacker& dp) const;
-	BOOL	deserialize(LLDataPacker& dp, const LLUUID& asset_id, bool allow_invalid_joints = true);
-	BOOL	isLoaded() { return mJointMotionList != NULL; }
+	bool	serialize(LLDataPacker& dp) const;
+	bool	deserialize(LLDataPacker& dp, const LLUUID& asset_id, bool allow_invalid_joints = true);
+	bool	isLoaded() { return mJointMotionList != NULL; }
     bool	dumpToFile(const std::string& name);
 
 
 	// setters for modifying a keyframe animation
-	void setLoop(BOOL loop);
+	void setLoop(bool loop);
 
 	F32 getLoopIn() {
 		return (mJointMotionList) ? mJointMotionList->mLoopInPoint : 0.f;
@@ -211,7 +211,7 @@ protected:
 			mEaseInStopTime(0.f),
 			mEaseOutStartTime(0.f),
 			mEaseOutStopTime(0.f), 
-			mUseTargetOffset(FALSE),
+			mUseTargetOffset(false),
 			mConstraintType(CONSTRAINT_TYPE_POINT),
 			mConstraintTargetType(CONSTRAINT_TARGET_TYPE_BODY),
 			mSourceConstraintVolume(0),
@@ -231,7 +231,7 @@ protected:
 		F32						mEaseInStopTime;
 		F32						mEaseOutStartTime;
 		F32						mEaseOutStopTime;
-		BOOL					mUseTargetOffset;
+		bool					mUseTargetOffset;
 		EConstraintType			mConstraintType;
 		EConstraintTargetType	mConstraintTargetType;
 	};
@@ -251,7 +251,7 @@ protected:
 		LLVector3					mPositions[MAX_CHAIN_LENGTH];
 		F32							mJointLengths[MAX_CHAIN_LENGTH];
 		F32							mJointLengthFractions[MAX_CHAIN_LENGTH];
-		BOOL						mActive;
+		bool						mActive;
 		LLVector3d					mGroundPos;
 		LLVector3					mGroundNorm;
 		LLJoint*					mSourceVolume;
@@ -271,7 +271,7 @@ protected:
 
 	void applyConstraint(JointConstraint* constraintp, F32 time, U8* joint_mask);
 
-	BOOL	setupPose();
+	bool	setupPose();
 
 public:
 	enum AssetStatus { ASSET_LOADED, ASSET_FETCHED, ASSET_NEEDS_FETCH, ASSET_FETCH_FAILED, ASSET_UNDEFINED };
diff --git a/indra/llcharacter/llkeyframemotionparam.cpp b/indra/llcharacter/llkeyframemotionparam.cpp
index 88c1a7ebe4..dfb6c1ec9f 100644
--- a/indra/llcharacter/llkeyframemotionparam.cpp
+++ b/indra/llcharacter/llkeyframemotionparam.cpp
@@ -133,7 +133,7 @@ LLMotion::LLMotionInitStatus LLKeyframeMotionParam::onInitialize(LLCharacter *ch
 //-----------------------------------------------------------------------------
 // LLKeyframeMotionParam::onActivate()
 //-----------------------------------------------------------------------------
-BOOL LLKeyframeMotionParam::onActivate()
+bool LLKeyframeMotionParam::onActivate()
 {
 	for (motion_map_t::value_type& motion_pair : mParameterizedMotions)
 	{
@@ -150,7 +150,7 @@ BOOL LLKeyframeMotionParam::onActivate()
 //-----------------------------------------------------------------------------
 // LLKeyframeMotionParam::onUpdate()
 //-----------------------------------------------------------------------------
-BOOL LLKeyframeMotionParam::onUpdate(F32 time, U8* joint_mask)
+bool LLKeyframeMotionParam::onUpdate(F32 time, U8* joint_mask)
 {
     LL_PROFILE_ZONE_SCOPED;
 	F32 weightFactor = 1.f / (F32)mParameterizedMotions.size();
@@ -283,7 +283,7 @@ void LLKeyframeMotionParam::onDeactivate()
 //-----------------------------------------------------------------------------
 // LLKeyframeMotionParam::addKeyframeMotion()
 //-----------------------------------------------------------------------------
-BOOL LLKeyframeMotionParam::addKeyframeMotion(char *name, const LLUUID &id, char *param, F32 value)
+bool LLKeyframeMotionParam::addKeyframeMotion(char *name, const LLUUID &id, char *param, F32 value)
 {
 	LLMotion *newMotion = mCharacter->createMotion( id );
 	
@@ -322,7 +322,7 @@ void LLKeyframeMotionParam::setDefaultKeyframeMotion(char *name)
 //-----------------------------------------------------------------------------
 // loadMotions()
 //-----------------------------------------------------------------------------
-BOOL LLKeyframeMotionParam::loadMotions()
+bool LLKeyframeMotionParam::loadMotions()
 {
 	//-------------------------------------------------------------------------
 	// Load named file by concatenating the character prefix with the motion name.
@@ -401,7 +401,7 @@ BOOL LLKeyframeMotionParam::loadMotions()
 	//-------------------------------------------------------------------------
 	// get priority
 	//-------------------------------------------------------------------------
-	BOOL isFirstMotion = TRUE;
+	bool isFirstMotion = true;
 	num = sscanf(p, "%79s %79s %f", strA, strB, &floatA);	/* Flawfinder: ignore */
 
 	while(1)
@@ -416,7 +416,7 @@ BOOL LLKeyframeMotionParam::loadMotions()
 		addKeyframeMotion(strA, gAnimLibrary.stringToAnimState(std::string(strA)), strB, floatA);
 		if (isFirstMotion)
 		{
-			isFirstMotion = FALSE;
+			isFirstMotion = false;
 			setDefaultKeyframeMotion(strA);
 		}
 		
diff --git a/indra/llcharacter/llkeyframemotionparam.h b/indra/llcharacter/llkeyframemotionparam.h
index 3b0bc36012..553d95dbbe 100644
--- a/indra/llcharacter/llkeyframemotionparam.h
+++ b/indra/llcharacter/llkeyframemotionparam.h
@@ -102,14 +102,14 @@ public:
 	virtual LLMotionInitStatus onInitialize(LLCharacter *character);
 
 	// called when a motion is activated
-	// must return TRUE to indicate success, or else
+	// must return true to indicate success, or else
 	// it will be deactivated
-	virtual BOOL onActivate();
+	virtual bool onActivate();
 
 	// called per time step
-	// must return TRUE while it is active, and
-	// must return FALSE when the motion is completed.
-	virtual BOOL onUpdate(F32 time, U8* joint_mask);
+	// must return true while it is active, and
+	// must return false when the motion is completed.
+	virtual bool onUpdate(F32 time, U8* joint_mask);
 
 	// called when a motion is deactivated
 	virtual void onDeactivate();
@@ -128,12 +128,12 @@ protected:
 	};
 	
 	// add a motion and associated parameter triplet
-	BOOL addKeyframeMotion(char *name, const LLUUID &id, char *param, F32 value);
+	bool addKeyframeMotion(char *name, const LLUUID &id, char *param, F32 value);
 	
 	// set default motion for LOD and retrieving blend constants
 	void setDefaultKeyframeMotion(char *);
 
-	BOOL loadMotions();
+	bool loadMotions();
 
 protected:
 	//-------------------------------------------------------------------------
diff --git a/indra/llcharacter/llkeyframestandmotion.cpp b/indra/llcharacter/llkeyframestandmotion.cpp
index f99492fd47..5e31d70216 100644
--- a/indra/llcharacter/llkeyframestandmotion.cpp
+++ b/indra/llcharacter/llkeyframestandmotion.cpp
@@ -46,7 +46,7 @@ const F32 POSITION_THRESHOLD = 0.1f;
 //-----------------------------------------------------------------------------
 LLKeyframeStandMotion::LLKeyframeStandMotion(const LLUUID &id) : LLKeyframeMotion(id)
 {
-	mFlipFeet = FALSE;
+	mFlipFeet = false;
 	mCharacter = NULL;
 
 	// create kinematic hierarchy
@@ -67,7 +67,7 @@ LLKeyframeStandMotion::LLKeyframeStandMotion(const LLUUID &id) : LLKeyframeMotio
 	mKneeRightState =  NULL;
 	mAnkleRightState =  NULL;
 
-	mTrackAnkles = TRUE;
+	mTrackAnkles = true;
 
 	mFrameNum = 0;
 }
@@ -90,7 +90,7 @@ LLMotion::LLMotionInitStatus LLKeyframeStandMotion::onInitialize(LLCharacter *ch
 	// save character pointer for later use
 	mCharacter = character;
 
-	mFlipFeet = FALSE;
+	mFlipFeet = false;
 
 	// load keyframe data, setup pose and joint states
 	LLMotion::LLMotionInitStatus status = LLKeyframeMotion::onInitialize(character);
@@ -129,7 +129,7 @@ LLMotion::LLMotionInitStatus LLKeyframeStandMotion::onInitialize(LLCharacter *ch
 //-----------------------------------------------------------------------------
 // LLKeyframeStandMotion::onActivate()
 //-----------------------------------------------------------------------------
-BOOL LLKeyframeStandMotion::onActivate()
+bool LLKeyframeStandMotion::onActivate()
 {
 	//-------------------------------------------------------------------------
 	// setup the IK solvers
@@ -158,12 +158,12 @@ void LLKeyframeStandMotion::onDeactivate()
 //-----------------------------------------------------------------------------
 // LLKeyframeStandMotion::onUpdate()
 //-----------------------------------------------------------------------------
-BOOL LLKeyframeStandMotion::onUpdate(F32 time, U8* joint_mask)
+bool LLKeyframeStandMotion::onUpdate(F32 time, U8* joint_mask)
 {
 	//-------------------------------------------------------------------------
 	// let the base class update the cycle
 	//-------------------------------------------------------------------------
-	BOOL status = LLKeyframeMotion::onUpdate(time, joint_mask);
+	bool status = LLKeyframeMotion::onUpdate(time, joint_mask);
 	if (!status)
 	{
 		return false;
@@ -185,16 +185,16 @@ BOOL LLKeyframeStandMotion::onUpdate(F32 time, U8* joint_mask)
 	{
 		mLastGoodPelvisRotation = mPelvisState->getJoint()->getWorldRotation();
 		mLastGoodPelvisRotation.normalize();
-		mTrackAnkles = TRUE;
+		mTrackAnkles = true;
 	}
 	else if ((mCharacter->getCharacterPosition() - mLastGoodPosition).magVecSquared() > POSITION_THRESHOLD)
 	{
 		mLastGoodPosition = mCharacter->getCharacterPosition();
-		mTrackAnkles = TRUE;
+		mTrackAnkles = true;
 	}
 	else if (mPose.getWeight() < 1.f)
 	{
-		mTrackAnkles = TRUE;
+		mTrackAnkles = true;
 	}
 
 
diff --git a/indra/llcharacter/llkeyframestandmotion.h b/indra/llcharacter/llkeyframestandmotion.h
index 1aa5b187ba..0932a837bd 100644
--- a/indra/llcharacter/llkeyframestandmotion.h
+++ b/indra/llcharacter/llkeyframestandmotion.h
@@ -63,9 +63,9 @@ public:
 	// animation callbacks to be implemented by subclasses
 	//-------------------------------------------------------------------------
 	virtual LLMotionInitStatus onInitialize(LLCharacter *character);
-	virtual BOOL onActivate();
+	virtual bool onActivate();
 	void	onDeactivate();
-	virtual BOOL onUpdate(F32 time, U8* joint_mask);
+	virtual bool onUpdate(F32 time, U8* joint_mask);
 
 public:
 	//-------------------------------------------------------------------------
@@ -85,7 +85,7 @@ public:
 
 	LLCharacter	*mCharacter;
 
-	BOOL				mFlipFeet;
+	bool				mFlipFeet;
 
 	LLPointer<LLJointState>	mPelvisState;
 
@@ -109,7 +109,7 @@ public:
 
 	LLQuaternion		mLastGoodPelvisRotation;
 	LLVector3			mLastGoodPosition;
-	BOOL				mTrackAnkles;
+	bool				mTrackAnkles;
 
 	S32					mFrameNum;
 } LL_ALIGN_POSTFIX(16);
diff --git a/indra/llcharacter/llkeyframewalkmotion.cpp b/indra/llcharacter/llkeyframewalkmotion.cpp
index ae0a03925d..1dd743e096 100644
--- a/indra/llcharacter/llkeyframewalkmotion.cpp
+++ b/indra/llcharacter/llkeyframewalkmotion.cpp
@@ -83,7 +83,7 @@ LLMotion::LLMotionInitStatus LLKeyframeWalkMotion::onInitialize(LLCharacter *cha
 //-----------------------------------------------------------------------------
 // LLKeyframeWalkMotion::onActivate()
 //-----------------------------------------------------------------------------
-BOOL LLKeyframeWalkMotion::onActivate()
+bool LLKeyframeWalkMotion::onActivate()
 {
 	mRealTimeLast = 0.0f;
 	mAdjTimeLast = 0.0f;
@@ -103,7 +103,7 @@ void LLKeyframeWalkMotion::onDeactivate()
 //-----------------------------------------------------------------------------
 // LLKeyframeWalkMotion::onUpdate()
 //-----------------------------------------------------------------------------
-BOOL LLKeyframeWalkMotion::onUpdate(F32 time, U8* joint_mask)
+bool LLKeyframeWalkMotion::onUpdate(F32 time, U8* joint_mask)
 {
     LL_PROFILE_ZONE_SCOPED;
 	// compute time since last update
@@ -174,7 +174,7 @@ LLMotion::LLMotionInitStatus LLWalkAdjustMotion::onInitialize(LLCharacter *chara
 //-----------------------------------------------------------------------------
 // LLWalkAdjustMotion::onActivate()
 //-----------------------------------------------------------------------------
-BOOL LLWalkAdjustMotion::onActivate()
+bool LLWalkAdjustMotion::onActivate()
 {
 	mAnimSpeed = 0.f;
 	mAdjustedSpeed = 0.f;
@@ -197,7 +197,7 @@ BOOL LLWalkAdjustMotion::onActivate()
 //-----------------------------------------------------------------------------
 // LLWalkAdjustMotion::onUpdate()
 //-----------------------------------------------------------------------------
-BOOL LLWalkAdjustMotion::onUpdate(F32 time, U8* joint_mask)
+bool LLWalkAdjustMotion::onUpdate(F32 time, U8* joint_mask)
 {
     LL_PROFILE_ZONE_SCOPED;
 	// delta_time is guaranteed to be non zero
@@ -362,7 +362,7 @@ LLMotion::LLMotionInitStatus LLFlyAdjustMotion::onInitialize(LLCharacter *charac
 //-----------------------------------------------------------------------------
 // LLFlyAdjustMotion::onActivate()
 //-----------------------------------------------------------------------------
-BOOL LLFlyAdjustMotion::onActivate()
+bool LLFlyAdjustMotion::onActivate()
 {
 	mPelvisState->setPosition(LLVector3::zero);
 	mPelvisState->setRotation(LLQuaternion::DEFAULT);
@@ -373,7 +373,7 @@ BOOL LLFlyAdjustMotion::onActivate()
 //-----------------------------------------------------------------------------
 // LLFlyAdjustMotion::onUpdate()
 //-----------------------------------------------------------------------------
-BOOL LLFlyAdjustMotion::onUpdate(F32 time, U8* joint_mask)
+bool LLFlyAdjustMotion::onUpdate(F32 time, U8* joint_mask)
 {
     LL_PROFILE_ZONE_SCOPED;
 	LLVector3 ang_vel = mCharacter->getCharacterAngularVelocity() * mCharacter->getTimeDilation();
diff --git a/indra/llcharacter/llkeyframewalkmotion.h b/indra/llcharacter/llkeyframewalkmotion.h
index d9e9322c82..7539d84db1 100644
--- a/indra/llcharacter/llkeyframewalkmotion.h
+++ b/indra/llcharacter/llkeyframewalkmotion.h
@@ -65,9 +65,9 @@ public:
 	// animation callbacks to be implemented by subclasses
 	//-------------------------------------------------------------------------
 	virtual LLMotionInitStatus onInitialize(LLCharacter *character);
-	virtual BOOL onActivate();
+	virtual bool onActivate();
 	virtual void onDeactivate();
-	virtual BOOL onUpdate(F32 time, U8* joint_mask);
+	virtual bool onUpdate(F32 time, U8* joint_mask);
 
 public:
 	//-------------------------------------------------------------------------
@@ -100,9 +100,9 @@ public:
 	// animation callbacks to be implemented by subclasses
 	//-------------------------------------------------------------------------
 	virtual LLMotionInitStatus onInitialize(LLCharacter *character);
-	virtual BOOL onActivate();
+	virtual bool onActivate();
 	virtual void onDeactivate();
-	virtual BOOL onUpdate(F32 time, U8* joint_mask);
+	virtual bool onUpdate(F32 time, U8* joint_mask);
 	virtual LLJoint::JointPriority getPriority(){return LLJoint::HIGH_PRIORITY;}
 	virtual bool getLoop() { return true; }
 	virtual F32 getDuration() { return 0.f; }
@@ -150,9 +150,9 @@ public:
 	// animation callbacks to be implemented by subclasses
 	//-------------------------------------------------------------------------
 	virtual LLMotionInitStatus onInitialize(LLCharacter *character);
-	virtual BOOL onActivate();
+	virtual bool onActivate();
 	virtual void onDeactivate() {};
-	virtual BOOL onUpdate(F32 time, U8* joint_mask);
+	virtual bool onUpdate(F32 time, U8* joint_mask);
 	virtual LLJoint::JointPriority getPriority(){return LLJoint::HIGHER_PRIORITY;}
 	virtual bool getLoop() { return true; }
 	virtual F32 getDuration() { return 0.f; }
diff --git a/indra/llcharacter/llmotion.cpp b/indra/llcharacter/llmotion.cpp
index a3c23a9c94..a0b599663e 100644
--- a/indra/llcharacter/llmotion.cpp
+++ b/indra/llcharacter/llmotion.cpp
@@ -43,8 +43,8 @@
 // Class Constructor
 //-----------------------------------------------------------------------------
 LLMotion::LLMotion( const LLUUID &id ) :
-	mStopped(TRUE),
-	mActive(FALSE),
+	mStopped(true),
+	mActive(false),
 	mID(id),
 	mActivationTimestamp(0.f),
 	mStopTimestamp(0.f),
@@ -132,10 +132,10 @@ void LLMotion::setDeactivateCallback( void (*cb)(void *), void* userdata )
 void LLMotion::setStopTime(F32 time)
 {
 	mStopTimestamp = time;
-	mStopped = TRUE;
+	mStopped = true;
 }
 
-BOOL LLMotion::isBlending()
+bool LLMotion::isBlending()
 {
 	return mPose.getWeight() < 1.f;
 }
@@ -146,8 +146,8 @@ BOOL LLMotion::isBlending()
 void LLMotion::activate(F32 time)
 {
 	mActivationTimestamp = time;
-	mStopped = FALSE;
-	mActive = TRUE;
+	mStopped = false;
+	mActive = true;
 	onActivate();
 }
 
@@ -156,7 +156,7 @@ void LLMotion::activate(F32 time)
 //-----------------------------------------------------------------------------
 void LLMotion::deactivate()
 {
-	mActive = FALSE;
+	mActive = false;
 	mPose.setWeight(0.f);
 
 	if (mDeactivateCallback)
diff --git a/indra/llcharacter/llmotion.h b/indra/llcharacter/llmotion.h
index 1453979764..d6d7267115 100644
--- a/indra/llcharacter/llmotion.h
+++ b/indra/llcharacter/llmotion.h
@@ -91,21 +91,21 @@ public:
 
 	virtual void setStopTime(F32 time);
 
-	BOOL isStopped() const { return mStopped; }
+	bool isStopped() const { return mStopped; }
 
-	void setStopped(BOOL stopped) { mStopped = stopped; }
+	void setStopped(bool stopped) { mStopped = stopped; }
 
-	BOOL isBlending();
+	bool isBlending();
 
 	// Activation functions.
 	// It is OK for other classes to activate a motion,
 	// but only the controller can deactivate it.
-	// Thus, if mActive == TRUE, the motion *may* be on the controllers active list,
-	// but if mActive == FALSE, the motion is gauranteed not to be on the active list.
+	// Thus, if mActive == true, the motion *may* be on the controllers active list,
+	// but if mActive == false, the motion is gauranteed not to be on the active list.
 protected:
 	// Used by LLMotionController only
 	void deactivate();
-	BOOL isActive() { return mActive; }
+	bool isActive() { return mActive; }
 public:
 	void activate(F32 time);
 	
@@ -144,15 +144,15 @@ public:
 	virtual LLMotionInitStatus onInitialize(LLCharacter *character) = 0;
 
 	// 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) = 0;
+	// must return true while it is active, and
+	// must return false when the motion is completed.
+	virtual bool onUpdate(F32 activeTime, U8* joint_mask) = 0;
 
 	// called when a motion is deactivated
 	virtual void onDeactivate() = 0;
 
 	// can we crossfade this motion with a new instance when restarted?
-	// should ultimately always be TRUE, but lack of emote blending, etc
+	// should ultimately always be true, but lack of emote blending, etc
 	// requires this
 	virtual bool canDeprecate();
 
@@ -161,16 +161,16 @@ public:
 
 protected:
 	// called when a motion is activated
-	// must return TRUE to indicate success, or else
+	// must return true to indicate success, or else
 	// it will be deactivated
-	virtual BOOL onActivate() = 0;
+	virtual bool onActivate() = 0;
 
 	void addJointState(const LLPointer<LLJointState>& jointState);
 
 protected:
 	LLPose		mPose;
-	BOOL		mStopped;		// motion has been stopped;
-	BOOL		mActive;		// motion is on active list (can be stopped or not stopped)
+	bool		mStopped;		// motion has been stopped;
+	bool		mActive;		// motion is on active list (can be stopped or not stopped)
 
 	//-------------------------------------------------------------------------
 	// these are set implicitly by the motion controller and
@@ -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; }
 };
 
@@ -251,14 +251,14 @@ public:
 	/*virtual*/ LLMotionInitStatus onInitialize(LLCharacter *character) { return STATUS_SUCCESS; }
 
 	// called when a motion is activated
-	// must return TRUE to indicate success, or else
+	// 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; }
+	// 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; }
 
 	// called when a motion is deactivated
 	/*virtual*/ void onDeactivate() {}
diff --git a/indra/llcharacter/llmotioncontroller.cpp b/indra/llcharacter/llmotioncontroller.cpp
index 750547da93..115606d863 100644
--- a/indra/llcharacter/llmotioncontroller.cpp
+++ b/indra/llcharacter/llmotioncontroller.cpp
@@ -76,7 +76,7 @@ LLMotionRegistry::~LLMotionRegistry()
 //-----------------------------------------------------------------------------
 // addMotion()
 //-----------------------------------------------------------------------------
-BOOL LLMotionRegistry::registerMotion( const LLUUID& id, LLMotionConstructor constructor )
+bool LLMotionRegistry::registerMotion( const LLUUID& id, LLMotionConstructor constructor )
 {
 	//	LL_INFOS() << "Registering motion: " << name << LL_ENDL;
 	if (!is_in_map(mMotionTable, id))
@@ -133,13 +133,13 @@ LLMotionController::LLMotionController()
 	  mAnimTime(0.f),
 	  mPrevTimerElapsed(0.f),
 	  mLastTime(0.0f),
-	  mHasRunOnce(FALSE),
-	  mPaused(FALSE),
+	  mHasRunOnce(false),
+	  mPaused(false),
 	  mPausedFrame(0),
 	  mTimeStep(0.f),
 	  mTimeStepCount(0),
 	  mLastInterp(0.f),
-	  mIsSelf(FALSE),
+	  mIsSelf(false),
 	  mLastCountAfterPurge(0)
 {
 }
@@ -275,7 +275,7 @@ void LLMotionController::setTimeStep(F32 step)
 			LLMotion* motionp = *iter;
 			F32 activation_time = motionp->mActivationTimestamp;
 			motionp->mActivationTimestamp = (F32)(llfloor(activation_time / step)) * step;
-			BOOL stopped = motionp->isStopped();
+			bool stopped = motionp->isStopped();
 			motionp->setStopTime((F32)(llfloor(motionp->getStopTime() / step)) * step);
 			motionp->setStopped(stopped);
 			motionp->mSendStopTimestamp = (F32)llfloor(motionp->mSendStopTimestamp / step) * step;
@@ -303,7 +303,7 @@ void LLMotionController::setCharacter(LLCharacter *character)
 //-----------------------------------------------------------------------------
 // registerMotion()
 //-----------------------------------------------------------------------------
-BOOL LLMotionController::registerMotion( const LLUUID& id, LLMotionConstructor constructor )
+bool LLMotionController::registerMotion( const LLUUID& id, LLMotionConstructor constructor )
 {
 	return sRegistry.registerMotion(id, constructor);
 }
@@ -389,7 +389,7 @@ LLMotion* LLMotionController::createMotion( const LLUUID &id )
 //-----------------------------------------------------------------------------
 // startMotion()
 //-----------------------------------------------------------------------------
-BOOL LLMotionController::startMotion(const LLUUID &id, F32 start_offset)
+bool LLMotionController::startMotion(const LLUUID &id, F32 start_offset)
 {
 	// do we have an instance of this motion for this character?
 	LLMotion *motion = findMotion(id);
@@ -431,7 +431,7 @@ BOOL LLMotionController::startMotion(const LLUUID &id, F32 start_offset)
 //-----------------------------------------------------------------------------
 // stopMotionLocally()
 //-----------------------------------------------------------------------------
-BOOL LLMotionController::stopMotionLocally(const LLUUID &id, BOOL stop_immediate)
+bool LLMotionController::stopMotionLocally(const LLUUID &id, bool stop_immediate)
 {
 	// if already inactive, return false
 	LLMotion *motion = findMotion(id);
@@ -439,7 +439,7 @@ BOOL LLMotionController::stopMotionLocally(const LLUUID &id, BOOL stop_immediate
 	return stopMotionInstance(motion, stop_immediate||mPaused);
 }
 
-BOOL LLMotionController::stopMotionInstance(LLMotion* motion, BOOL stop_immediate)
+bool LLMotionController::stopMotionInstance(LLMotion* motion, bool stop_immediate)
 {
 	if (!motion)
 	{
@@ -459,7 +459,7 @@ BOOL LLMotionController::stopMotionInstance(LLMotion* motion, BOOL stop_immediat
 	}
 	else if (isMotionLoading(motion))
 	{
-		motion->setStopped(TRUE);
+		motion->setStopped(true);
 		return true;
 	}
 
@@ -518,7 +518,7 @@ void LLMotionController::updateIdleMotion(LLMotion* motionp)
 		if (mLastTime <= motionp->mSendStopTimestamp)
 		{
 			mCharacter->requestStopMotion( motionp );
-			stopMotionInstance(motionp, FALSE);
+			stopMotionInstance(motionp, false);
 		}
 	}
 	else if (mAnimTime >= motionp->mActivationTimestamp)
@@ -552,7 +552,7 @@ void LLMotionController::updateIdleActiveMotions()
 void LLMotionController::updateMotionsByType(LLMotion::LLMotionBlendType anim_type)
 {
     LL_PROFILE_ZONE_SCOPED_CATEGORY_AVATAR;
-	BOOL update_result = TRUE;
+	bool update_result = true;
 	U8 last_joint_signature[LL_CHARACTER_MAX_ANIMATED_JOINTS];
 
 	memset(&last_joint_signature, 0, sizeof(U8) * LL_CHARACTER_MAX_ANIMATED_JOINTS);
@@ -568,11 +568,11 @@ void LLMotionController::updateMotionsByType(LLMotion::LLMotionBlendType anim_ty
 			continue;
 		}
 
-		BOOL update_motion = FALSE;
+		bool update_motion = false;
 
 		if (motionp->getPose()->getWeight() < 1.f)
 		{
-			update_motion = TRUE;
+			update_motion = true;
 		}
 		else
 		{
@@ -584,7 +584,7 @@ void LLMotionController::updateMotionsByType(LLMotion::LLMotionBlendType anim_ty
 				if ((*current_signature | test_signature) > (*current_signature))
 				{
 					*current_signature |= test_signature;
-					update_motion = TRUE;
+					update_motion = true;
 				}
 
 				*((U32*)&last_joint_signature[i * 4]) = *(U32*)&(mJointSignature[1][i * 4]);
@@ -594,7 +594,7 @@ void LLMotionController::updateMotionsByType(LLMotion::LLMotionBlendType anim_ty
 				if ((*current_signature | test_signature) > (*current_signature))
 				{
 					*current_signature |= test_signature;
-					update_motion = TRUE;
+					update_motion = true;
 				}
 			}
 		}
@@ -620,7 +620,7 @@ void LLMotionController::updateMotionsByType(LLMotion::LLMotionBlendType anim_ty
 				if (mLastTime <= motionp->mSendStopTimestamp)
 				{
 					mCharacter->requestStopMotion( motionp );
-					stopMotionInstance(motionp, FALSE);
+					stopMotionInstance(motionp, false);
 				}
 			}
 
@@ -701,7 +701,7 @@ void LLMotionController::updateMotionsByType(LLMotion::LLMotionBlendType anim_ty
 				if (mLastTime <= motionp->mSendStopTimestamp)
 				{
 					mCharacter->requestStopMotion( motionp );
-					stopMotionInstance(motionp, FALSE);
+					stopMotionInstance(motionp, false);
 				}
 			}
 
@@ -747,12 +747,12 @@ void LLMotionController::updateMotionsByType(LLMotion::LLMotionBlendType anim_ty
 				// propagate this to the network
 				// as not all viewers are guaranteed to have access to the same logic
 				mCharacter->requestStopMotion( motionp );
-				stopMotionInstance(motionp, FALSE);
+				stopMotionInstance(motionp, false);
 			}
 
 		}
 
-		// even if onupdate returns FALSE, add this motion in to the blend one last time
+		// even if onupdate returns false, add this motion in to the blend one last time
 		mPoseBlender.addMotion(motionp);
 	}
 }
@@ -815,7 +815,7 @@ void LLMotionController::updateMotions(bool force_update)
     // The use_quantum optimization or possibly the associated code in setTimeStamp()
     // does not work as implemented.
     // Currently setting mTimeStep to nonzero is disabled elsewhere.
-	BOOL use_quantum = (mTimeStep != 0.f);
+	bool use_quantum = (mTimeStep != 0.f);
 
 	// Always update mPrevTimerElapsed
 	F32 cur_time = mTimer.getElapsedTimeF32();
@@ -885,7 +885,7 @@ void LLMotionController::updateMotions(bool force_update)
 		
 		if (use_quantum)
 		{
-			mPoseBlender.blendAndCache(TRUE);
+			mPoseBlender.blendAndCache(true);
 		}
 		else
 		{
@@ -893,7 +893,7 @@ void LLMotionController::updateMotions(bool force_update)
 		}
 	}
 
-	mHasRunOnce = TRUE;
+	mHasRunOnce = true;
 //	LL_INFOS() << "Motion controller time " << motionTimer.getElapsedTimeF32() << LL_ENDL;
 }
 
@@ -913,13 +913,13 @@ void LLMotionController::updateMotionsMinimal()
 
 	deactivateStoppedMotions();
 
-	mHasRunOnce = TRUE;
+	mHasRunOnce = true;
 }
 
 //-----------------------------------------------------------------------------
 // activateMotionInstance()
 //-----------------------------------------------------------------------------
-BOOL LLMotionController::activateMotionInstance(LLMotion *motion, F32 time)
+bool LLMotionController::activateMotionInstance(LLMotion *motion, F32 time)
 {
     LL_PROFILE_ZONE_SCOPED_CATEGORY_AVATAR;
 	// It's not clear why the getWeight() line seems to be crashing this, but
@@ -932,7 +932,7 @@ BOOL LLMotionController::activateMotionInstance(LLMotion *motion, F32 time)
 	if (mLoadingMotions.find(motion) != mLoadingMotions.end())
 	{
 		// we want to start this motion, but we can't yet, so flag it as started
-		motion->setStopped(FALSE);
+		motion->setStopped(false);
 		// report pending animations as activated
 		return true;
 	}
@@ -984,7 +984,7 @@ BOOL LLMotionController::activateMotionInstance(LLMotion *motion, F32 time)
 //-----------------------------------------------------------------------------
 // deactivateMotionInstance()
 //-----------------------------------------------------------------------------
-BOOL LLMotionController::deactivateMotionInstance(LLMotion *motion)
+bool LLMotionController::deactivateMotionInstance(LLMotion *motion)
 {
 	motion->deactivate();
 
@@ -1009,7 +1009,7 @@ void LLMotionController::deprecateMotionInstance(LLMotion* motion)
 	mDeprecatedMotions.insert(motion);
 
 	//fade out deprecated motion
-	stopMotionInstance(motion, FALSE);
+	stopMotionInstance(motion, false);
 	//no longer canonical
 	mAllMotions.erase(motion->getID());
 }
@@ -1124,7 +1124,7 @@ void LLMotionController::pauseAllMotions()
 	if (!mPaused)
 	{
 		//LL_INFOS() << "Pausing animations..." << LL_ENDL;
-		mPaused = TRUE;
+		mPaused = true;
         mPausedFrame = LLFrameTimer::getFrameCount();
 	}
 	
@@ -1138,7 +1138,7 @@ void LLMotionController::unpauseAllMotions()
 	if (mPaused)
 	{
 		//LL_INFOS() << "Unpausing animations..." << LL_ENDL;
-		mPaused = FALSE;
+		mPaused = false;
 	}
 }
 // End
diff --git a/indra/llcharacter/llmotioncontroller.h b/indra/llcharacter/llmotioncontroller.h
index 637ee4d2bb..dea470cbd3 100644
--- a/indra/llcharacter/llmotioncontroller.h
+++ b/indra/llcharacter/llmotioncontroller.h
@@ -62,7 +62,7 @@ public:
 
 	// adds motion classes to the registry
 	// returns true if successfull
-	BOOL registerMotion( const LLUUID& id, LLMotionConstructor create);
+	bool registerMotion( const LLUUID& id, LLMotionConstructor create);
 
 	// creates a new instance of a named motion
 	// returns NULL motion is not registered
@@ -85,7 +85,7 @@ class LLMotionController
 public:
 	typedef std::list<LLMotion*> motion_list_t;
 	typedef std::set<LLMotion*> motion_set_t;
-	BOOL mIsSelf;
+	bool mIsSelf;
 	
 public:
 	// Constructor
@@ -102,7 +102,7 @@ public:
 	// registers a motion with the controller
 	// (actually just forwards call to motion registry)
 	// returns true if successfull
-	BOOL registerMotion( const LLUUID& id, LLMotionConstructor create );
+	bool registerMotion( const LLUUID& id, LLMotionConstructor create );
 
 	// creates a motion from the registry
 	LLMotion *createMotion( const LLUUID &id );
@@ -115,13 +115,13 @@ public:
 	// start motion
 	// begins playing the specified motion
 	// returns true if successful
-	BOOL startMotion( const LLUUID &id, F32 start_offset );
+	bool startMotion( const LLUUID &id, F32 start_offset );
 
 	// stop motion
 	// stops a playing motion
 	// in reality, it begins the ease out transition phase
 	// returns true if successful
-	BOOL stopMotionLocally( const LLUUID &id, BOOL stop_immediate );
+	bool stopMotionLocally( const LLUUID &id, bool stop_immediate );
 
 	// Move motions from loading to loaded
 	void updateLoadingMotions();
@@ -147,7 +147,7 @@ public:
 	// pause and continue all motions
 	void pauseAllMotions();
 	void unpauseAllMotions();
-	BOOL isPaused() const { return mPaused; }
+	bool isPaused() const { return mPaused; }
     S32 getPausedFrame() const { return mPausedFrame; }
 
 	void setTimeStep(F32 step);
@@ -178,10 +178,10 @@ protected:
 	// internal operations act on motion instances directly
 	// as there can be duplicate motions per id during blending overlap
 	void deleteAllMotions();
-	BOOL activateMotionInstance(LLMotion *motion, F32 time);
-	BOOL deactivateMotionInstance(LLMotion *motion);
+	bool activateMotionInstance(LLMotion *motion, F32 time);
+	bool deactivateMotionInstance(LLMotion *motion);
 	void deprecateMotionInstance(LLMotion* motion);
-	BOOL stopMotionInstance(LLMotion *motion, BOOL stop_imemdiate);
+	bool stopMotionInstance(LLMotion *motion, bool stop_imemdiate);
 	void removeMotionInstance(LLMotion* motion);
 	void updateRegularMotions();
 	void updateAdditiveMotions();
@@ -220,8 +220,8 @@ protected:
 	F32					mPrevTimerElapsed;
 	F32					mAnimTime;
 	F32					mLastTime;
-	BOOL				mHasRunOnce;
-	BOOL				mPaused;
+	bool				mHasRunOnce;
+	bool				mPaused;
 	S32					mPausedFrame;
 	F32					mTimeStep;
 	S32					mTimeStepCount;
diff --git a/indra/llcharacter/llmultigesture.cpp b/indra/llcharacter/llmultigesture.cpp
index 2938bf9473..73652a15b4 100644
--- a/indra/llcharacter/llmultigesture.cpp
+++ b/indra/llcharacter/llmultigesture.cpp
@@ -48,7 +48,7 @@ LLMultiGesture::LLMultiGesture()
 	mTrigger(),
 	mReplaceText(),
 	mSteps(),
-	mPlaying(FALSE),
+	mPlaying(false),
 	mCurrentStep(0),
 	mDoneCallback(NULL),
 	mCallbackData(NULL)
@@ -64,12 +64,12 @@ LLMultiGesture::~LLMultiGesture()
 
 void LLMultiGesture::reset()
 {
-	mPlaying = FALSE;
+	mPlaying = false;
 	mCurrentStep = 0;
 	mWaitTimer.reset();
-	mWaitingTimer = FALSE;
-	mWaitingAnimations = FALSE;
-	mWaitingAtEnd = FALSE;
+	mWaitingTimer = false;
+	mWaitingAnimations = false;
+	mWaitingAtEnd = false;
 	mRequestedAnimIDs.clear();
 	mPlayingAnimIDs.clear();
 }
@@ -114,7 +114,7 @@ S32 LLMultiGesture::getMaxSerialSize() const
 	return max_size;
 }
 
-BOOL LLMultiGesture::serialize(LLDataPacker& dp) const
+bool LLMultiGesture::serialize(LLDataPacker& dp) const
 {
 	dp.packS32(GESTURE_VERSION, "version");
 	dp.packU8(mKey, "key");
@@ -130,7 +130,7 @@ BOOL LLMultiGesture::serialize(LLDataPacker& dp) const
 		LLGestureStep* step = mSteps[i];
 
 		dp.packS32(step->getType(), "step_type");
-		BOOL ok = step->serialize(dp);
+		bool ok = step->serialize(dp);
 		if (!ok)
 		{
 			return false;
@@ -139,7 +139,7 @@ BOOL LLMultiGesture::serialize(LLDataPacker& dp) const
 	return true;
 }
 
-BOOL LLMultiGesture::deserialize(LLDataPacker& dp)
+bool LLMultiGesture::deserialize(LLDataPacker& dp)
 {
 	S32 version;
 	dp.unpackS32(version, "version");
@@ -179,7 +179,7 @@ BOOL LLMultiGesture::deserialize(LLDataPacker& dp)
 		case STEP_ANIMATION:
 			{
 				LLGestureStepAnimation* step = new LLGestureStepAnimation();
-				BOOL ok = step->deserialize(dp);
+				bool ok = step->deserialize(dp);
 				if (!ok) return false;
 				mSteps.push_back(step);
 				break;
@@ -187,7 +187,7 @@ BOOL LLMultiGesture::deserialize(LLDataPacker& dp)
 		case STEP_SOUND:
 			{
 				LLGestureStepSound* step = new LLGestureStepSound();
-				BOOL ok = step->deserialize(dp);
+                bool ok = step->deserialize(dp);
 				if (!ok) return false;
 				mSteps.push_back(step);
 				break;
@@ -195,7 +195,7 @@ BOOL LLMultiGesture::deserialize(LLDataPacker& dp)
 		case STEP_CHAT:
 			{
 				LLGestureStepChat* step = new LLGestureStepChat();
-				BOOL ok = step->deserialize(dp);
+                bool ok = step->deserialize(dp);
 				if (!ok) return false;
 				mSteps.push_back(step);
 				break;
@@ -203,7 +203,7 @@ BOOL LLMultiGesture::deserialize(LLDataPacker& dp)
 		case STEP_WAIT:
 			{
 				LLGestureStepWait* step = new LLGestureStepWait();
-				BOOL ok = step->deserialize(dp);
+                bool ok = step->deserialize(dp);
 				if (!ok) return false;
 				mSteps.push_back(step);
 				break;
@@ -262,7 +262,7 @@ S32 LLGestureStepAnimation::getMaxSerialSize() const
 	return max_size;
 }
 
-BOOL LLGestureStepAnimation::serialize(LLDataPacker& dp) const
+bool LLGestureStepAnimation::serialize(LLDataPacker& dp) const
 {
 	dp.packString(mAnimName, "anim_name");
 	dp.packUUID(mAnimAssetID, "asset_id");
@@ -270,7 +270,7 @@ BOOL LLGestureStepAnimation::serialize(LLDataPacker& dp) const
 	return true;
 }
 
-BOOL LLGestureStepAnimation::deserialize(LLDataPacker& dp)
+bool LLGestureStepAnimation::deserialize(LLDataPacker& dp)
 {
 	dp.unpackString(mAnimName, "anim_name");
 
@@ -344,7 +344,7 @@ S32 LLGestureStepSound::getMaxSerialSize() const
 	return max_size;
 }
 
-BOOL LLGestureStepSound::serialize(LLDataPacker& dp) const
+bool LLGestureStepSound::serialize(LLDataPacker& dp) const
 {
 	dp.packString(mSoundName, "sound_name");
 	dp.packUUID(mSoundAssetID, "asset_id");
@@ -352,7 +352,7 @@ BOOL LLGestureStepSound::serialize(LLDataPacker& dp) const
 	return true;
 }
 
-BOOL LLGestureStepSound::deserialize(LLDataPacker& dp)
+bool LLGestureStepSound::deserialize(LLDataPacker& dp)
 {
 	dp.unpackString(mSoundName, "sound_name");
 
@@ -404,14 +404,14 @@ S32 LLGestureStepChat::getMaxSerialSize() const
 	return max_size;
 }
 
-BOOL LLGestureStepChat::serialize(LLDataPacker& dp) const
+bool LLGestureStepChat::serialize(LLDataPacker& dp) const
 {
 	dp.packString(mChatText, "chat_text");
 	dp.packU32(mFlags, "flags");
 	return true;
 }
 
-BOOL LLGestureStepChat::deserialize(LLDataPacker& dp)
+bool LLGestureStepChat::deserialize(LLDataPacker& dp)
 {
 	dp.unpackString(mChatText, "chat_text");
 
@@ -459,14 +459,14 @@ S32 LLGestureStepWait::getMaxSerialSize() const
 	return max_size;
 }
 
-BOOL LLGestureStepWait::serialize(LLDataPacker& dp) const
+bool LLGestureStepWait::serialize(LLDataPacker& dp) const
 {
 	dp.packF32(mWaitSeconds, "wait_seconds");
 	dp.packU32(mFlags, "flags");
 	return true;
 }
 
-BOOL LLGestureStepWait::deserialize(LLDataPacker& dp)
+bool LLGestureStepWait::deserialize(LLDataPacker& dp)
 {
 	dp.unpackF32(mWaitSeconds, "wait_seconds");
 	dp.unpackU32(mFlags, "flags");
diff --git a/indra/llcharacter/llmultigesture.h b/indra/llcharacter/llmultigesture.h
index 92820159d4..13acbc3f52 100644
--- a/indra/llcharacter/llmultigesture.h
+++ b/indra/llcharacter/llmultigesture.h
@@ -46,8 +46,8 @@ public:
 	// Maximum number of bytes this could hold once serialized.
 	S32 getMaxSerialSize() const;
 
-	BOOL serialize(LLDataPacker& dp) const;
-	BOOL deserialize(LLDataPacker& dp);
+	bool serialize(LLDataPacker& dp) const;
+	bool deserialize(LLDataPacker& dp);
 
 	void dump();
 
@@ -75,19 +75,19 @@ public:
 	std::vector<LLGestureStep*> mSteps;
 
 	// Is the gesture currently playing?
-	BOOL mPlaying;
+	bool mPlaying;
 
 	// "instruction pointer" for steps
 	S32 mCurrentStep;
 
 	// We're waiting for triggered animations to stop playing
-	BOOL mWaitingAnimations;
+	bool mWaitingAnimations;
 
 	// We're waiting a fixed amount of time
-	BOOL mWaitingTimer;
+	bool mWaitingTimer;
 
 	// Waiting after the last step played for all animations to complete
-	BOOL mWaitingAtEnd;
+	bool mWaitingAtEnd;
 
 	// Timer for waiting
 	LLFrameTimer mWaitTimer;
@@ -129,8 +129,8 @@ public:
 	virtual std::vector<std::string> getLabel() const = 0;
 
 	virtual S32 getMaxSerialSize() const = 0;
-	virtual BOOL serialize(LLDataPacker& dp) const = 0;
-	virtual BOOL deserialize(LLDataPacker& dp) = 0;
+	virtual bool serialize(LLDataPacker& dp) const = 0;
+	virtual bool deserialize(LLDataPacker& dp) = 0;
 
 	virtual void dump() = 0;
 };
@@ -151,8 +151,8 @@ public:
 	virtual std::vector<std::string> getLabel() const;
 
 	virtual S32 getMaxSerialSize() const;
-	virtual BOOL serialize(LLDataPacker& dp) const;
-	virtual BOOL deserialize(LLDataPacker& dp);
+	virtual bool serialize(LLDataPacker& dp) const;
+	virtual bool deserialize(LLDataPacker& dp);
 
 	virtual void dump();
 
@@ -174,8 +174,8 @@ public:
 	virtual std::vector<std::string> getLabel() const;
 
 	virtual S32 getMaxSerialSize() const;
-	virtual BOOL serialize(LLDataPacker& dp) const;
-	virtual BOOL deserialize(LLDataPacker& dp);
+	virtual bool serialize(LLDataPacker& dp) const;
+	virtual bool deserialize(LLDataPacker& dp);
 
 	virtual void dump();
 
@@ -197,8 +197,8 @@ public:
 	virtual std::vector<std::string> getLabel() const;
 
 	virtual S32 getMaxSerialSize() const;
-	virtual BOOL serialize(LLDataPacker& dp) const;
-	virtual BOOL deserialize(LLDataPacker& dp);
+	virtual bool serialize(LLDataPacker& dp) const;
+	virtual bool deserialize(LLDataPacker& dp);
 
 	virtual void dump();
 
@@ -222,8 +222,8 @@ public:
 	virtual std::vector<std::string> getLabel() const;
 
 	virtual S32 getMaxSerialSize() const;
-	virtual BOOL serialize(LLDataPacker& dp) const;
-	virtual BOOL deserialize(LLDataPacker& dp);
+	virtual bool serialize(LLDataPacker& dp) const;
+	virtual bool deserialize(LLDataPacker& dp);
 
 	virtual void dump();
 
diff --git a/indra/llcharacter/llpose.cpp b/indra/llcharacter/llpose.cpp
index 5acdfbf532..1983607d47 100644
--- a/indra/llcharacter/llpose.cpp
+++ b/indra/llcharacter/llpose.cpp
@@ -81,7 +81,7 @@ LLJointState *LLPose::getNextJointState()
 //-----------------------------------------------------------------------------
 // addJointState()
 //-----------------------------------------------------------------------------
-BOOL LLPose::addJointState(const LLPointer<LLJointState>& jointState)
+bool LLPose::addJointState(const LLPointer<LLJointState>& jointState)
 {
 	if (mJointMap.find(jointState->getJoint()->getName()) == mJointMap.end())
 	{
@@ -93,7 +93,7 @@ BOOL LLPose::addJointState(const LLPointer<LLJointState>& jointState)
 //-----------------------------------------------------------------------------
 // removeJointState()
 //-----------------------------------------------------------------------------
-BOOL LLPose::removeJointState(const LLPointer<LLJointState>& jointState)
+bool LLPose::removeJointState(const LLPointer<LLJointState>& jointState)
 {
 	mJointMap.erase(jointState->getJoint()->getName());
 	return true;
@@ -102,7 +102,7 @@ BOOL LLPose::removeJointState(const LLPointer<LLJointState>& jointState)
 //-----------------------------------------------------------------------------
 // removeAllJointStates()
 //-----------------------------------------------------------------------------
-BOOL LLPose::removeAllJointStates()
+bool LLPose::removeAllJointStates()
 {
 	mJointMap.clear();
 	return true;
@@ -181,7 +181,7 @@ LLJointStateBlender::LLJointStateBlender()
 	{
 		mJointStates[i] = NULL;
 		mPriorities[i] = S32_MIN;
-		mAdditiveBlends[i] = FALSE;
+		mAdditiveBlends[i] = false;
 	}
 }
 
@@ -193,7 +193,7 @@ LLJointStateBlender::~LLJointStateBlender()
 //-----------------------------------------------------------------------------
 // addJointState()
 //-----------------------------------------------------------------------------
-BOOL LLJointStateBlender::addJointState(const LLPointer<LLJointState>& joint_state, S32 priority, BOOL additive_blend)
+bool LLJointStateBlender::addJointState(const LLPointer<LLJointState>& joint_state, S32 priority, bool additive_blend)
 {
 	llassert(joint_state);
 
@@ -235,7 +235,7 @@ BOOL LLJointStateBlender::addJointState(const LLPointer<LLJointState>& joint_sta
 //-----------------------------------------------------------------------------
 // blendJointStates()
 //-----------------------------------------------------------------------------
-void LLJointStateBlender::blendJointStates(BOOL apply_now)
+void LLJointStateBlender::blendJointStates(bool apply_now)
 {
 	// we need at least one joint to blend
 	// if there is one, it will be in slot zero according to insertion logic
@@ -468,7 +468,7 @@ LLPoseBlender::~LLPoseBlender()
 //-----------------------------------------------------------------------------
 // addMotion()
 //-----------------------------------------------------------------------------
-BOOL LLPoseBlender::addMotion(LLMotion* motion)
+bool LLPoseBlender::addMotion(LLMotion* motion)
 {
 	LLPose* pose = motion->getPose();
 
@@ -525,7 +525,7 @@ void LLPoseBlender::blendAndApply()
 //-----------------------------------------------------------------------------
 // blendAndCache()
 //-----------------------------------------------------------------------------
-void LLPoseBlender::blendAndCache(BOOL reset_cached_joints)
+void LLPoseBlender::blendAndCache(bool reset_cached_joints)
 {
 	for (blender_list_t::iterator iter = mActiveBlenders.begin();
 		 iter != mActiveBlenders.end(); ++iter)
@@ -535,7 +535,7 @@ void LLPoseBlender::blendAndCache(BOOL reset_cached_joints)
 		{
 			jsbp->resetCachedJoint();
 		}
-		jsbp->blendJointStates(FALSE);
+		jsbp->blendJointStates(false);
 	}
 }
 
diff --git a/indra/llcharacter/llpose.h b/indra/llcharacter/llpose.h
index 1405f1e053..d43956e120 100644
--- a/indra/llcharacter/llpose.h
+++ b/indra/llcharacter/llpose.h
@@ -65,11 +65,11 @@ public:
 	// Destructor
 	~LLPose();
 	// add a joint state in this pose
-	BOOL addJointState(const LLPointer<LLJointState>& jointState);
+	bool addJointState(const LLPointer<LLJointState>& jointState);
 	// remove a joint state from this pose
-	BOOL removeJointState(const LLPointer<LLJointState>& jointState);
+	bool removeJointState(const LLPointer<LLJointState>& jointState);
 	// removes all joint states from this pose
-	BOOL removeAllJointStates();
+	bool removeAllJointStates();
 	// set weight for all joint states in this pose
 	void setWeight(F32 weight);
 	// get weight for this pose
@@ -87,12 +87,12 @@ class LLJointStateBlender
 protected:
 	LLPointer<LLJointState>	mJointStates[JSB_NUM_JOINT_STATES];
 	S32				mPriorities[JSB_NUM_JOINT_STATES];
-	BOOL			mAdditiveBlends[JSB_NUM_JOINT_STATES];
+	bool			mAdditiveBlends[JSB_NUM_JOINT_STATES];
 public:
 	LLJointStateBlender();
 	~LLJointStateBlender();
-	void blendJointStates(BOOL apply_now = TRUE);
-	BOOL addJointState(const LLPointer<LLJointState>& joint_state, S32 priority, BOOL additive_blend);
+	void blendJointStates(bool apply_now = true);
+	bool addJointState(const LLPointer<LLJointState>& joint_state, S32 priority, bool additive_blend);
 	void interpolate(F32 u);
 	void clear();
 	void resetCachedJoint();
@@ -120,7 +120,7 @@ public:
 	~LLPoseBlender();
 	
 	// request motion joint states to be added to pose blender joint state records
-	BOOL addMotion(LLMotion* motion);
+	bool addMotion(LLMotion* motion);
 
 	// blend all joint states and apply to skeleton
 	void blendAndApply();
@@ -129,7 +129,7 @@ public:
 	void clearBlenders();
 
 	// blend all joint states and cache results
-	void blendAndCache(BOOL reset_cached_joints);
+	void blendAndCache(bool reset_cached_joints);
 
 	// interpolate all joints towards cached values
 	void interpolate(F32 u);
diff --git a/indra/llcharacter/llstatemachine.cpp b/indra/llcharacter/llstatemachine.cpp
index 8261670728..261eaf0350 100644
--- a/indra/llcharacter/llstatemachine.cpp
+++ b/indra/llcharacter/llstatemachine.cpp
@@ -49,7 +49,7 @@ bool	operator!=(const LLUniqueID &a, const LLUniqueID &b)
 LLStateDiagram::LLStateDiagram()
 {
 	mDefaultState = NULL;
-	mUseDefaultState = FALSE;
+	mUseDefaultState = false;
 }
 
 LLStateDiagram::~LLStateDiagram()
@@ -58,14 +58,14 @@ LLStateDiagram::~LLStateDiagram()
 }
 
 // add a state to the state graph
-BOOL LLStateDiagram::addState(LLFSMState *state)
+bool LLStateDiagram::addState(LLFSMState *state)
 {
 	mStates[state] = Transitions();
 	return true;
 }
 
 // add a directed transition between 2 states
-BOOL LLStateDiagram::addTransition(LLFSMState& start_state, LLFSMState& end_state, LLFSMTransition& transition)
+bool LLStateDiagram::addTransition(LLFSMState& start_state, LLFSMState& end_state, LLFSMTransition& transition)
 {
 	StateMap::iterator state_it;
 	state_it = mStates.find(&start_state);
@@ -97,9 +97,9 @@ BOOL LLStateDiagram::addTransition(LLFSMState& start_state, LLFSMState& end_stat
 }
 
 // add an undirected transition between 2 states
-BOOL LLStateDiagram::addUndirectedTransition(LLFSMState& start_state, LLFSMState& end_state, LLFSMTransition& transition)
+bool LLStateDiagram::addUndirectedTransition(LLFSMState& start_state, LLFSMState& end_state, LLFSMTransition& transition)
 {
-	BOOL result;
+	bool result;
 	result = addTransition(start_state, end_state, transition);
 	if (result)
 	{
@@ -162,7 +162,7 @@ LLFSMState* LLStateDiagram::processTransition(LLFSMState& start_state, LLFSMTran
 
 void LLStateDiagram::setDefaultState(LLFSMState& default_state)
 {
-	mUseDefaultState = TRUE;
+	mUseDefaultState = true;
 	mDefaultState = &default_state;
 }
 
@@ -179,7 +179,7 @@ S32 LLStateDiagram::numDeadendStates()
 	return numDeadends;
 }
 
-BOOL LLStateDiagram::stateIsValid(LLFSMState& state)
+bool LLStateDiagram::stateIsValid(LLFSMState& state)
 {
 	if (mStates.find(&state) != mStates.end())
 	{
@@ -200,7 +200,7 @@ LLFSMState* LLStateDiagram::getState(U32 state_id)
 	return NULL;
 }
 
-BOOL LLStateDiagram::saveDotFile(const std::string& filename)
+bool LLStateDiagram::saveDotFile(const std::string& filename)
 {
 	LLAPRFile outfile ;
 	outfile.open(filename, LL_APR_W);
@@ -308,7 +308,7 @@ void LLStateMachine::runCurrentState(void *data)
 }
 
 // set current state
-BOOL LLStateMachine::setCurrentState(LLFSMState *initial_state, void* user_data, BOOL skip_entry)
+bool LLStateMachine::setCurrentState(LLFSMState *initial_state, void* user_data, bool skip_entry)
 {
 	llassert(mStateDiagram);
 
@@ -325,7 +325,7 @@ BOOL LLStateMachine::setCurrentState(LLFSMState *initial_state, void* user_data,
 	return false;
 }
 
-BOOL LLStateMachine::setCurrentState(U32 state_id, void* user_data, BOOL skip_entry)
+bool LLStateMachine::setCurrentState(U32 state_id, void* user_data, bool skip_entry)
 {
 	llassert(mStateDiagram);
 
diff --git a/indra/llcharacter/llstatemachine.h b/indra/llcharacter/llstatemachine.h
index a2f7e59bd2..521da113e9 100644
--- a/indra/llcharacter/llstatemachine.h
+++ b/indra/llcharacter/llstatemachine.h
@@ -74,7 +74,7 @@ protected:
 	StateMap			mStates;
 	Transitions			mDefaultTransitions;
 	LLFSMState*			mDefaultState;
-	BOOL				mUseDefaultState;
+	bool				mUseDefaultState;
 
 public:
 	LLStateDiagram();
@@ -82,13 +82,13 @@ public:
 
 protected:
 	// add a state to the state graph, executed implicitly when adding transitions
-	BOOL addState(LLFSMState *state);
+	bool addState(LLFSMState *state);
 
 	// add a directed transition between 2 states
-	BOOL addTransition(LLFSMState& start_state, LLFSMState& end_state, LLFSMTransition& transition);
+	bool addTransition(LLFSMState& start_state, LLFSMState& end_state, LLFSMTransition& transition);
 
 	// add an undirected transition between 2 states
-	BOOL addUndirectedTransition(LLFSMState& start_state, LLFSMState& end_state, LLFSMTransition& transition);
+	bool addUndirectedTransition(LLFSMState& start_state, LLFSMState& end_state, LLFSMTransition& transition);
 
 	// add a transition that is taken if none other exist
 	void addDefaultTransition(LLFSMState& end_state, LLFSMTransition& transition);
@@ -103,14 +103,14 @@ protected:
 	S32 numDeadendStates();
 
 	// does this state exist in the state diagram?
-	BOOL stateIsValid(LLFSMState& state);
+	bool stateIsValid(LLFSMState& state);
 
 	// get a state pointer by ID
 	LLFSMState* getState(U32 state_id);
 
 public:
 	// save the graph in a DOT file for rendering and visualization
-	BOOL saveDotFile(const std::string& filename);
+	bool saveDotFile(const std::string& filename);
 };
 
 class LLStateMachine
@@ -138,10 +138,10 @@ public:
 	void runCurrentState(void *data);
 
 	// set state by state pointer
-	BOOL setCurrentState(LLFSMState *initial_state, void* user_data, BOOL skip_entry = TRUE);
+	bool setCurrentState(LLFSMState *initial_state, void* user_data, bool skip_entry = true);
 
 	// set state by unique ID
-	BOOL setCurrentState(U32 state_id, void* user_data, BOOL skip_entry = TRUE);
+	bool setCurrentState(U32 state_id, void* user_data, bool skip_entry = true);
 };
 
 #endif //_LL_LLSTATEMACHINE_H
diff --git a/indra/llcharacter/lltargetingmotion.cpp b/indra/llcharacter/lltargetingmotion.cpp
index 0697d04fd3..87d61a2d36 100644
--- a/indra/llcharacter/lltargetingmotion.cpp
+++ b/indra/llcharacter/lltargetingmotion.cpp
@@ -93,7 +93,7 @@ LLMotion::LLMotionInitStatus LLTargetingMotion::onInitialize(LLCharacter *charac
 //-----------------------------------------------------------------------------
 // LLTargetingMotion::onActivate()
 //-----------------------------------------------------------------------------
-BOOL LLTargetingMotion::onActivate()
+bool LLTargetingMotion::onActivate()
 {
 	return true;
 }
@@ -101,7 +101,7 @@ BOOL LLTargetingMotion::onActivate()
 //-----------------------------------------------------------------------------
 // LLTargetingMotion::onUpdate()
 //-----------------------------------------------------------------------------
-BOOL LLTargetingMotion::onUpdate(F32 time, U8* joint_mask)
+bool LLTargetingMotion::onUpdate(F32 time, U8* joint_mask)
 {
     LL_PROFILE_ZONE_SCOPED;
 	F32 slerp_amt = LLSmoothInterpolation::getInterpolant(TORSO_TARGET_HALF_LIFE);
@@ -109,7 +109,7 @@ BOOL LLTargetingMotion::onUpdate(F32 time, U8* joint_mask)
 	LLVector3 target;
 	LLVector3* lookAtPoint = (LLVector3*)mCharacter->getAnimationData("LookAtPoint");
 
-	BOOL result = TRUE;
+	bool result = true;
 
 	if (!lookAtPoint)
 	{
diff --git a/indra/llcharacter/lltargetingmotion.h b/indra/llcharacter/lltargetingmotion.h
index 85749a0882..b284dd2941 100644
--- a/indra/llcharacter/lltargetingmotion.h
+++ b/indra/llcharacter/lltargetingmotion.h
@@ -91,14 +91,14 @@ public:
 	virtual LLMotionInitStatus onInitialize(LLCharacter *character);
 
 	// called when a motion is activated
-	// must return TRUE to indicate success, or else
+	// must return true to indicate success, or else
 	// it will be deactivated
-	virtual BOOL onActivate();
+	virtual bool onActivate();
 
 	// called per time step
-	// must return TRUE while it is active, and
-	// must return FALSE when the motion is completed.
-	virtual BOOL onUpdate(F32 time, U8* joint_mask);
+	// must return true while it is active, and
+	// must return true when the motion is completed.
+	virtual bool onUpdate(F32 time, U8* joint_mask);
 
 	// called when a motion is deactivated
 	virtual void onDeactivate();
diff --git a/indra/llcharacter/llvisualparam.cpp b/indra/llcharacter/llvisualparam.cpp
index 2255191e59..5930a28ee8 100644
--- a/indra/llcharacter/llvisualparam.cpp
+++ b/indra/llcharacter/llvisualparam.cpp
@@ -164,8 +164,8 @@ LLVisualParam::LLVisualParam()
 	mLastWeight( 0.f ),
 	mNext( NULL ),
 	mTargetWeight( 0.f ),
-	mIsAnimating( FALSE ),
-	mIsDummy(FALSE),
+	mIsAnimating( false ),
+	mIsDummy(false),
 	mID( -1 ),
 	mInfo( 0 ),
 	mParamLocation(LOC_UNKNOWN)
@@ -207,21 +207,21 @@ LLVisualParam::~LLVisualParam()
 // setInfo()
 //-----------------------------------------------------------------------------
 
-BOOL LLVisualParam::setInfo(LLVisualParamInfo *info)
+bool LLVisualParam::setInfo(LLVisualParamInfo *info)
 {
 	llassert(mInfo == NULL);
 	if (info->mID < 0)
 		return false;
 	mInfo = info;
 	mID = info->mID;
-	setWeight(getDefaultWeight(), FALSE );
+	setWeight(getDefaultWeight(), false );
 	return true;
 }
 
 //-----------------------------------------------------------------------------
 // parseData()
 //-----------------------------------------------------------------------------
-BOOL LLVisualParam::parseData(LLXmlTreeNode *node)
+bool LLVisualParam::parseData(LLXmlTreeNode *node)
 {
 	LLVisualParamInfo *info = new LLVisualParamInfo;
 
@@ -282,7 +282,7 @@ void LLVisualParam::setAnimationTarget(F32 target_value)
 	{
 		mTargetWeight = target_value;
 	}
-	mIsAnimating = TRUE;
+	mIsAnimating = true;
 
 	if (mNext)
 	{
@@ -327,7 +327,7 @@ void LLVisualParam::stopAnimating()
 { 
 	if (mIsAnimating && isTweakable())
 	{
-		mIsAnimating = FALSE; 
+		mIsAnimating = false; 
 		setWeight(mTargetWeight);
 	}
 }
diff --git a/indra/llcharacter/llvisualparam.h b/indra/llcharacter/llvisualparam.h
index 2a632689f0..9cbb3962f4 100644
--- a/indra/llcharacter/llvisualparam.h
+++ b/indra/llcharacter/llvisualparam.h
@@ -113,11 +113,11 @@ public:
 	// (They can not be virtual because they use specific derived Info classes)
 	LLVisualParamInfo*		getInfo() const { return mInfo; }
 	//   This sets mInfo and calls initialization functions
-	BOOL					setInfo(LLVisualParamInfo *info);
+	bool					setInfo(LLVisualParamInfo *info);
 
 	// Virtual functions
 	//  Pure virtuals
-	//virtual BOOL			parseData( LLXmlTreeNode *node ) = 0;
+	//virtual bool			parseData( LLXmlTreeNode *node ) = 0;
 	virtual void			apply( ESex avatar_sex ) = 0;
 	//  Default functions
 	virtual void			setWeight(F32 weight);
@@ -151,17 +151,17 @@ public:
 	F32						getCurrentWeight() const 	{ return mCurWeight; }
 	F32						getLastWeight() const	{ return mLastWeight; }
 	void					setLastWeight(F32 val) { mLastWeight = val; }
-	BOOL					isAnimating() const	{ return mIsAnimating; }
-	BOOL					isTweakable() const { return (getGroup() == VISUAL_PARAM_GROUP_TWEAKABLE)  || (getGroup() == VISUAL_PARAM_GROUP_TWEAKABLE_NO_TRANSMIT); }
+	bool					isAnimating() const	{ return mIsAnimating; }
+	bool					isTweakable() const { return (getGroup() == VISUAL_PARAM_GROUP_TWEAKABLE)  || (getGroup() == VISUAL_PARAM_GROUP_TWEAKABLE_NO_TRANSMIT); }
 
 	LLVisualParam*			getNextParam()		{ return mNext; }
 	void					setNextParam( LLVisualParam *next );
 	void					clearNextParam();
 	
-	virtual void			setAnimating(BOOL is_animating) { mIsAnimating = is_animating && !mIsDummy; }
-	BOOL					getAnimating() const { return mIsAnimating; }
+	virtual void			setAnimating(bool is_animating) { mIsAnimating = is_animating && !mIsDummy; }
+	bool					getAnimating() const { return mIsAnimating; }
 
-	void					setIsDummy(BOOL is_dummy) { mIsDummy = is_dummy; }
+	void					setIsDummy(bool is_dummy) { mIsDummy = is_dummy; }
 
 	void					setParamLocation(EParamLocation loc);
 	EParamLocation			getParamLocation() const { return mParamLocation; }
@@ -173,8 +173,8 @@ protected:
 	F32					mLastWeight;		// last weight
 	LLVisualParam*		mNext;				// next param in a shared chain
 	F32					mTargetWeight;		// interpolation target
-	BOOL				mIsAnimating;	// this value has been given an interpolation target
-	BOOL				mIsDummy;  // this is used to prevent dummy visual params from animating
+	bool				mIsAnimating;	// this value has been given an interpolation target
+	bool				mIsDummy;  // this is used to prevent dummy visual params from animating
 
 
 	S32					mID;				// id for storing weight/morphtarget compares compactly
diff --git a/indra/llcommon/llstring.cpp b/indra/llcommon/llstring.cpp
index ef77b0b1c8..6e6797312b 100644
--- a/indra/llcommon/llstring.cpp
+++ b/indra/llcommon/llstring.cpp
@@ -1359,7 +1359,7 @@ S32 LLStringUtil::format(std::string& s, const format_map_t& substitutions)
 			if (iter != substitutions.end())
 			{
 				S32 secFromEpoch = 0;
-				BOOL r = LLStringUtil::convertToS32(iter->second, secFromEpoch);
+				bool r = LLStringUtil::convertToS32(iter->second, secFromEpoch);
 				if (r)
 				{
 					found_replacement = formatDatetime(replacement, tokens[0], param, secFromEpoch);
diff --git a/indra/llcommon/llstring.h b/indra/llcommon/llstring.h
index 47dbf967cf..f2741a0e1f 100644
--- a/indra/llcommon/llstring.h
+++ b/indra/llcommon/llstring.h
@@ -382,7 +382,7 @@ public:
 	static void _makeASCII(string_type& string);
 
 	// Conversion to other data types
-	static bool	convertToBOOL(const string_type& string, BOOL& value);
+	static bool	convertToBOOL(const string_type& string, bool& value);
 	static bool	convertToU8(const string_type& string, U8& value);
 	static bool	convertToS8(const string_type& string, S8& value);
 	static bool	convertToS16(const string_type& string, S16& value);
@@ -1804,7 +1804,7 @@ auto LLStringUtilBase<T>::getenv(const std::string& key, const string_type& dflt
 }
 
 template<class T> 
-bool LLStringUtilBase<T>::convertToBOOL(const string_type& string, BOOL& value)
+bool LLStringUtilBase<T>::convertToBOOL(const string_type& string, bool& value)
 {
 	if( string.empty() )
 	{
diff --git a/indra/llinventory/llparcel.cpp b/indra/llinventory/llparcel.cpp
index aa9d9572be..78dcf40ac6 100644
--- a/indra/llinventory/llparcel.cpp
+++ b/indra/llinventory/llparcel.cpp
@@ -124,10 +124,10 @@ LLParcel::LLParcel()
 
 
 LLParcel::LLParcel(const LLUUID &owner_id,
-                   BOOL modify, BOOL terraform, BOOL damage,
+                   bool modify, bool terraform, bool damage,
                    time_t claim_date, S32 claim_price_per_meter,
                    S32 rent_price_per_meter, S32 area, S32 sim_object_limit, F32 parcel_object_bonus,
-                   BOOL is_group_owned)
+                   bool is_group_owned)
 {
     init( owner_id, modify, terraform, damage, claim_date,
           claim_price_per_meter, rent_price_per_meter, area, sim_object_limit, parcel_object_bonus,
@@ -142,10 +142,10 @@ LLParcel::~LLParcel()
 }
 
 void LLParcel::init(const LLUUID &owner_id,
-                    BOOL modify, BOOL terraform, BOOL damage,
+                    bool modify, bool terraform, bool damage,
                     time_t claim_date, S32 claim_price_per_meter,
                     S32 rent_price_per_meter, S32 area, S32 sim_object_limit, F32 parcel_object_bonus,
-                    BOOL is_group_owned)
+                    bool is_group_owned)
 {
 	mID.setNull();
 	mOwnerID			= owner_id;
@@ -172,7 +172,7 @@ void LLParcel::init(const LLUUID &owner_id,
 	mSaleTimerExpires.stop();
 	mGraceExtension = 0;
 	//mExpireAction = STEA_REVERT;
-	//mRecordTransaction = FALSE;
+	//mRecordTransaction = false;
 
 	mAuctionID = 0;
 	mInEscrow = false;
@@ -238,7 +238,7 @@ void LLParcel::init(const LLUUID &owner_id,
     setObscureMOAP(false);
 }
 
-void LLParcel::overrideOwner(const LLUUID& owner_id, BOOL is_group_owned)
+void LLParcel::overrideOwner(const LLUUID& owner_id, bool is_group_owned)
 {
     // Override with system permission (LLUUID::null)
     // Overridden parcels have no group
@@ -352,7 +352,7 @@ void LLParcel::setAllParcelFlags(U32 flags)
     mParcelFlags = flags;
 }
 
-void LLParcel::setParcelFlag(U32 flag, BOOL b)
+void LLParcel::setParcelFlag(U32 flag, bool b)
 {
     if (b)
     {
@@ -365,7 +365,7 @@ void LLParcel::setParcelFlag(U32 flag, BOOL b)
 }
 
 
-BOOL LLParcel::allowModifyBy(const LLUUID &agent_id, const LLUUID &group_id) const
+bool LLParcel::allowModifyBy(const LLUUID &agent_id, const LLUUID &group_id) const
 {
     if (agent_id == LLUUID::null)
     {
@@ -394,7 +394,7 @@ BOOL LLParcel::allowModifyBy(const LLUUID &agent_id, const LLUUID &group_id) con
     return false;
 }
 
-BOOL LLParcel::allowTerraformBy(const LLUUID &agent_id) const
+bool LLParcel::allowTerraformBy(const LLUUID &agent_id) const
 {
     if (agent_id == LLUUID::null)
     {
@@ -441,7 +441,7 @@ void LLParcel::setDiscountRate(F32 rate)
 // File input and output
 //-----------------------------------------------------------
 
-BOOL LLParcel::importAccessEntry(std::istream& input_stream, LLAccessEntry* entry)
+bool LLParcel::importAccessEntry(std::istream& input_stream, LLAccessEntry* entry)
 {
     skip_to_end_of_next_keyword("{", input_stream);
     while (input_stream.good())
@@ -561,9 +561,9 @@ void LLParcel::unpackMessage(LLMessageSystem* msg)
     msg->getStringFast( _PREHASH_ParcelData,_PREHASH_MediaURL, buffer );
     setMediaURL(buffer);
     
-	BOOL see_avs = TRUE;			// All default to true for legacy server behavior
-	BOOL any_av_sounds = TRUE;
-	BOOL group_av_sounds = TRUE;
+	bool see_avs = true;			// All default to true for legacy server behavior
+	bool any_av_sounds = true;
+	bool group_av_sounds = true;
 	bool have_new_parcel_limit_data = (msg->getSizeFast(_PREHASH_ParcelData, _PREHASH_SeeAVs) > 0);		// New version of server should send all 3 of these values
 	have_new_parcel_limit_data &= (msg->getSizeFast(_PREHASH_ParcelData, _PREHASH_AnyAVSounds) > 0);
 	have_new_parcel_limit_data &= (msg->getSizeFast(_PREHASH_ParcelData, _PREHASH_GroupAVSounds) > 0);
@@ -787,7 +787,7 @@ void LLParcel::extendAABB(const LLVector3& box_min, const LLVector3& box_max)
     }
 }
 
-BOOL LLParcel::addToAccessList(const LLUUID& agent_id, S32 time)
+bool LLParcel::addToAccessList(const LLUUID& agent_id, S32 time)
 {
 	if (mAccessList.size() >= (U32) PARCEL_MAX_ACCESS_LIST)
 	{
@@ -828,7 +828,7 @@ BOOL LLParcel::addToAccessList(const LLUUID& agent_id, S32 time)
     return true;
 }
 
-BOOL LLParcel::addToBanList(const LLUUID& agent_id, S32 time)
+bool LLParcel::addToBanList(const LLUUID& agent_id, S32 time)
 {
 	if (mBanList.size() >= (U32) PARCEL_MAX_ACCESS_LIST)
 	{
@@ -871,10 +871,10 @@ BOOL LLParcel::addToBanList(const LLUUID& agent_id, S32 time)
     return true;
 }
 
-BOOL remove_from_access_array(std::map<LLUUID,LLAccessEntry>* list,
+bool remove_from_access_array(std::map<LLUUID,LLAccessEntry>* list,
                               const LLUUID& agent_id)
 {
-    BOOL removed = FALSE;
+    bool removed = false;
     LLAccessEntry::map::iterator itor = list->begin();
     while (itor != list->end())
     {
@@ -882,7 +882,7 @@ BOOL remove_from_access_array(std::map<LLUUID,LLAccessEntry>* list,
         if (entry.mID == agent_id)
         {
             list->erase(itor++);
-            removed = TRUE;
+            removed = true;
         }
         else
         {
@@ -892,12 +892,12 @@ BOOL remove_from_access_array(std::map<LLUUID,LLAccessEntry>* list,
     return removed;
 }
 
-BOOL LLParcel::removeFromAccessList(const LLUUID& agent_id)
+bool LLParcel::removeFromAccessList(const LLUUID& agent_id)
 {
     return remove_from_access_array(&mAccessList, agent_id);
 }
 
-BOOL LLParcel::removeFromBanList(const LLUUID& agent_id)
+bool LLParcel::removeFromBanList(const LLUUID& agent_id)
 {
     return remove_from_access_array(&mBanList, agent_id);
 }
@@ -947,13 +947,13 @@ const std::string& LLParcel::getActionString(LLParcel::EAction action)
     return PARCEL_ACTION_STRING[index];
 }
 
-BOOL LLParcel::isSaleTimerExpired(const U64& time)
+bool LLParcel::isSaleTimerExpired(const U64& time)
 {
     if (mSaleTimerExpires.getStarted() == FALSE)
     {
         return false;
     }
-    BOOL expired = mSaleTimerExpires.checkExpirationAndReset(0.0);
+    bool expired = mSaleTimerExpires.checkExpirationAndReset(0.0);
     if (expired)
     {
         mSaleTimerExpires.stop();
@@ -961,13 +961,13 @@ BOOL LLParcel::isSaleTimerExpired(const U64& time)
     return expired;
 }
 
-BOOL LLParcel::isMediaResetTimerExpired(const U64& time)
+bool LLParcel::isMediaResetTimerExpired(const U64& time)
 {
-    if (mMediaResetTimer.getStarted() == FALSE)
+    if (mMediaResetTimer.getStarted() == false)
     {
         return false;
     }
-    BOOL expired = mMediaResetTimer.checkExpirationAndReset(0.0);
+    bool expired = mMediaResetTimer.checkExpirationAndReset(0.0);
     if (expired)
     {
         mMediaResetTimer.stop();
@@ -976,7 +976,7 @@ BOOL LLParcel::isMediaResetTimerExpired(const U64& time)
 }
 
 
-void LLParcel::startSale(const LLUUID& buyer_id, BOOL is_buyer_group)
+void LLParcel::startSale(const LLUUID& buyer_id, bool is_buyer_group)
 {
 	// TODO -- this and all Sale related methods need to move out of the LLParcel 
 	// base class and into server-side-only LLSimParcel class
@@ -1042,7 +1042,7 @@ void LLParcel::completeSale(
 
 	// Turn off show directory, since it's a recurring fee that
 	// the buyer may not want.
-	setParcelFlag(PF_SHOW_DIRECTORY, FALSE);
+	setParcelFlag(PF_SHOW_DIRECTORY, false);
 
 	//should be cleared on sale.
 	mAccessList.clear();
@@ -1069,12 +1069,12 @@ void LLParcel::clearSale()
 	setSellWithObjects(FALSE);
 }
 
-BOOL LLParcel::isPublic() const
+bool LLParcel::isPublic() const
 {
     return (mOwnerID.isNull());
 }
 
-BOOL LLParcel::isBuyerAuthorized(const LLUUID& buyer_id) const
+bool LLParcel::isBuyerAuthorized(const LLUUID& buyer_id) const
 {
     if(mAuthBuyerID.isNull())
     {
diff --git a/indra/llinventory/llparcel.h b/indra/llinventory/llparcel.h
index f5ee1241ab..e3c27e7d73 100644
--- a/indra/llinventory/llparcel.h
+++ b/indra/llinventory/llparcel.h
@@ -209,37 +209,37 @@ public:
 	LLParcel();
 	LLParcel(
 		const LLUUID &owner_id,
-		BOOL modify,
-		BOOL terraform,
-		BOOL damage,
+		bool modify,
+		bool terraform,
+		bool damage,
 		time_t claim_date,
 		S32 claim_price,
 		S32 rent_price,
 		S32 area,
 		S32 sim_object_limit,
 		F32 parcel_object_bonus,
-		BOOL is_group_owned = FALSE);
+		bool is_group_owned = false);
 	virtual ~LLParcel();
 
 	void init(
 		const LLUUID &owner_id,
-		BOOL modify,
-		BOOL terraform,
-		BOOL damage,
+		bool modify,
+		bool terraform,
+		bool damage,
 		time_t claim_date,
 		S32 claim_price,
 		S32 rent_price,
 		S32 area,
 		S32 sim_object_limit,
 		F32 parcel_object_bonus,
-		BOOL is_group_owned = FALSE);
+		bool is_group_owned = false);
 
 	// TODO: make an actual copy constructor for this
 	void overrideParcelFlags(U32 flags);
 	// if you specify an agent id here, the group id will be zeroed
 	void overrideOwner(
 		const LLUUID& owner_id,
-		BOOL is_group_owned = FALSE);
+		bool is_group_owned = false);
 	void overrideSaleTimerExpires(F32 secs_left) { mSaleTimerExpires.setTimerExpirySec(secs_left); }
 
 	// MANIPULATORS
@@ -283,7 +283,7 @@ public:
 	void setAuctionID(U32 auction_id) { mAuctionID = auction_id;}
 
 	void	setAllParcelFlags(U32 flags);
-	void	setParcelFlag(U32 flag, BOOL b);
+	void	setParcelFlag(U32 flag, bool b);
 
 	virtual void setArea(S32 area, S32 sim_object_limit);
 	void	setDiscountRate(F32 rate);
@@ -316,7 +316,7 @@ public:
 	void	setPassHours(F32 hours)				{ mPassHours = hours; }
 
 //	BOOL	importStream(std::istream& input_stream);
-	BOOL	importAccessEntry(std::istream& input_stream, LLAccessEntry* entry);
+	bool	importAccessEntry(std::istream& input_stream, LLAccessEntry* entry);
 	// BOOL	exportStream(std::ostream& output_stream);
 
 	void	packMessage(LLMessageSystem* msg);
@@ -344,10 +344,10 @@ public:
 	void expirePasses(S32 now);
 
 	// Add to list, suppressing duplicates.  Returns TRUE if added.
-	BOOL addToAccessList(const LLUUID& agent_id, S32 time);
-	BOOL addToBanList(const LLUUID& agent_id, S32 time);
-	BOOL removeFromAccessList(const LLUUID& agent_id);
-	BOOL removeFromBanList(const LLUUID& agent_id);
+	bool addToAccessList(const LLUUID& agent_id, S32 time);
+	bool addToBanList(const LLUUID& agent_id, S32 time);
+	bool removeFromAccessList(const LLUUID& agent_id);
+	bool removeFromBanList(const LLUUID& agent_id);
 
 	// ACCESSORS
 	const LLUUID&	getID() const				{ return mID; }
@@ -377,14 +377,14 @@ public:
 	U32 getAuctionID() const	{ return mAuctionID; }
 	bool isInEscrow() const		{ return mInEscrow; }
 
-	BOOL isPublic() const;
+	bool isPublic() const;
 
 	// Region-local user-specified position
 	const LLVector3& getUserLocation() const	{ return mUserLocation; }
 	const LLVector3& getUserLookAt() const	{ return mUserLookAt; }
 	ELandingType getLandingType() const	{ return mLandingType; }
-	BOOL getSeeAVs() const			{ return mSeeAVs;		}
-	BOOL getHaveNewParcelLimitData() const		{ return mHaveNewParcelLimitData;	}
+	bool getSeeAVs() const			{ return mSeeAVs;		}
+	bool getHaveNewParcelLimitData() const		{ return mHaveNewParcelLimitData;	}
 
 	// User-specified snapshot
 	const LLUUID&	getSnapshotID() const		{ return mSnapshotID; }
@@ -395,7 +395,7 @@ public:
 	const LLUUID& getAuthorizedBuyerID() const { return mAuthBuyerID; }
 
 	// helper function
-	BOOL isBuyerAuthorized(const LLUUID& buyer_id) const;
+	bool isBuyerAuthorized(const LLUUID& buyer_id) const;
 
 	// The buyer of a plot is set when someone indicates they want to
 	// buy the plot, and the system is simply waiting for tier-up
@@ -422,7 +422,7 @@ public:
 	// the isSaleTimerExpired will trivially return FALSE if there is
 	// no sale going on. Pass in the current time in usec which will
 	// be used for comparison.
-	BOOL isSaleTimerExpired(const U64& time);
+	bool isSaleTimerExpired(const U64& time);
 
 	F32 getSaleTimerExpires() { return mSaleTimerExpires.getRemainingTimeF32(); }
 
@@ -431,7 +431,7 @@ public:
 
 	// need to record a few things with the parcel when a sale
 	// starts.
-	void startSale(const LLUUID& buyer_id, BOOL is_buyer_group);
+	void startSale(const LLUUID& buyer_id, bool is_buyer_group);
 
 	// do the expiration logic, which needs to return values usable in
 	// a L$ transaction.
@@ -440,26 +440,26 @@ public:
 	void clearSale();
 
 
-	BOOL isMediaResetTimerExpired(const U64& time);
+	bool isMediaResetTimerExpired(const U64& time);
 
 
 	// more accessors
 	U32		getParcelFlags() const			{ return mParcelFlags; }
 
-	BOOL	getParcelFlag(U32 flag) const
-					{ return (mParcelFlags & flag) ? TRUE : FALSE; }
+	bool	getParcelFlag(U32 flag) const
+					{ return (mParcelFlags & flag) ? true : false; }
 
 	// objects can be added or modified by anyone (only parcel owner if disabled)
-	BOOL	getAllowModify() const
-					{ return (mParcelFlags & PF_CREATE_OBJECTS) ? TRUE : FALSE; }
+	bool	getAllowModify() const
+					{ return (mParcelFlags & PF_CREATE_OBJECTS) ? true : false; }
 
 	// objects can be added or modified by group members
-	BOOL	getAllowGroupModify() const
-					{ return (mParcelFlags & PF_CREATE_GROUP_OBJECTS) ? TRUE : FALSE; }
+	bool	getAllowGroupModify() const
+					{ return (mParcelFlags & PF_CREATE_GROUP_OBJECTS) ? true : false; }
 
 	// the parcel can be deeded to the group
-	BOOL	getAllowDeedToGroup() const
-					{ return (mParcelFlags & PF_ALLOW_DEED_TO_GROUP) ? TRUE : FALSE; }
+	bool	getAllowDeedToGroup() const
+					{ return (mParcelFlags & PF_ALLOW_DEED_TO_GROUP) ? true : false; }
 
 	// Does the owner want to make a contribution along with the deed.
 	BOOL getContributeWithDeed() const
@@ -537,10 +537,10 @@ public:
 	S32		getClaimPrice() const			{ return mClaimPricePerMeter * mArea; }
 
 	// Can this agent create objects here?
-	BOOL	allowModifyBy(const LLUUID &agent_id, const LLUUID &group_id) const;
+	bool	allowModifyBy(const LLUUID &agent_id, const LLUUID &group_id) const;
 
 	// Can this agent change the shape of the land?
-	BOOL	allowTerraformBy(const LLUUID &agent_id) const;
+	bool	allowTerraformBy(const LLUUID &agent_id) const;
 
 	bool	operator==(const LLParcel &rhs) const;
 
diff --git a/indra/llinventory/llpermissions.cpp b/indra/llinventory/llpermissions.cpp
index 0359d2f554..693a0da123 100644
--- a/indra/llinventory/llpermissions.cpp
+++ b/indra/llinventory/llpermissions.cpp
@@ -87,21 +87,21 @@ void LLPermissions::initMasks(LLInventoryType::EType type)
 	}
 }
 
-BOOL LLPermissions::getOwnership(LLUUID& owner_id, BOOL& is_group_owned) const
+bool LLPermissions::getOwnership(LLUUID& owner_id, bool& is_group_owned) const
 {
 	if(mOwner.notNull())
 	{
 		owner_id = mOwner;
-		is_group_owned = FALSE;
-		return TRUE;
+		is_group_owned = false;
+		return true;
 	}
 	else if(mIsGroupOwned)
 	{
 		owner_id = mGroup;
-		is_group_owned = TRUE;
-		return TRUE;
+		is_group_owned = true;
+		return true;
 	}
-	return FALSE;
+	return false;
 }
 
 LLUUID LLPermissions::getSafeOwner() const
@@ -232,13 +232,13 @@ void LLPermissions::accumulate(const LLPermissions& perm)
 // saves last owner, sets current owner, and sets the group.  note
 // that this function has to more cleverly apply the fair use
 // permissions.
-BOOL LLPermissions::setOwnerAndGroup(
+bool LLPermissions::setOwnerAndGroup(
 	const LLUUID& agent,
 	const LLUUID& owner,
 	const LLUUID& group,
 	bool is_atomic)
 {
-	BOOL allowed = FALSE;
+	bool allowed = false;
 
 	if( agent.isNull() || mOwner.isNull()
 	   || ((agent == mOwner) && ((owner == mOwner) || (mMaskOwner & PERM_TRANSFER)) ) )
@@ -246,7 +246,7 @@ BOOL LLPermissions::setOwnerAndGroup(
 		// ...system can alway set owner
 		// ...public objects can be claimed by anyone
 		// ...otherwise, agent must own it and have transfer ability
-		allowed = TRUE;
+		allowed = true;
 	}
 
 	if (allowed)
@@ -301,7 +301,7 @@ void LLPermissions::yesReallySetOwner(const LLUUID& owner, bool group_owned)
 	mIsGroupOwned = group_owned;
 }
 
-BOOL LLPermissions::deedToGroup(const LLUUID& agent, const LLUUID& group)
+bool LLPermissions::deedToGroup(const LLUUID& agent, const LLUUID& group)
 {
 	if(group.notNull() && (agent.isNull() || ((group == mGroup)
 											  && (mMaskOwner & PERM_TRANSFER)
@@ -318,18 +318,18 @@ BOOL LLPermissions::deedToGroup(const LLUUID& agent, const LLUUID& group)
 		mIsGroupOwned = true;
 		fixFairUse();
 		fix();
-		return TRUE;
+		return true;
 	}
-	return FALSE;
+	return false;
 }
 
-BOOL LLPermissions::setBaseBits(const LLUUID& agent, BOOL set, PermissionMask bits)
+bool LLPermissions::setBaseBits(const LLUUID& agent, bool set, PermissionMask bits)
 {
-	BOOL ownership = FALSE;
+	bool ownership = true;
 	if(agent.isNull())
 	{
 		// only the system is always allowed to change base bits
-		ownership = TRUE;
+		ownership = true;
 	}
 
 	if (ownership)
@@ -351,19 +351,19 @@ BOOL LLPermissions::setBaseBits(const LLUUID& agent, BOOL set, PermissionMask bi
 
 // Note: If you attempt to set bits that the base bits doesn't allow,
 // the function will succeed, but those bits will not be set.
-BOOL LLPermissions::setOwnerBits(const LLUUID& agent, BOOL set, PermissionMask bits)
+bool LLPermissions::setOwnerBits(const LLUUID& agent, bool set, PermissionMask bits)
 {
-	BOOL ownership = FALSE;
+	bool ownership = false;
 
 	if(agent.isNull())
 	{
 		// ...system always allowed to change things
-		ownership = TRUE;
+		ownership = true;
 	}
 	else if (agent == mOwner)
 	{
 		// ...owner bits can only be set by owner
-		ownership = TRUE;
+		ownership = true;
 	}
 
 	// If we have correct ownership and 
@@ -383,15 +383,15 @@ BOOL LLPermissions::setOwnerBits(const LLUUID& agent, BOOL set, PermissionMask b
 	return (ownership);
 }
 
-BOOL LLPermissions::setGroupBits(const LLUUID& agent, const LLUUID& group, BOOL set, PermissionMask bits)
+bool LLPermissions::setGroupBits(const LLUUID& agent, const LLUUID& group, bool set, PermissionMask bits)
 {
-	BOOL ownership = FALSE;
+	bool ownership = false;
 	if((agent.isNull()) || (agent == mOwner)
 	   || ((group == mGroup) && (!mGroup.isNull())))
 	{
 		// The group bits can be set by the system, the owner, or a
 		// group member.
-		ownership = TRUE;
+		ownership = true;
 	}
 
 	if (ownership)
@@ -412,15 +412,15 @@ BOOL LLPermissions::setGroupBits(const LLUUID& agent, const LLUUID& group, BOOL
 
 // Note: If you attempt to set bits that the creator or owner doesn't allow,
 // the function will succeed, but those bits will not be set.
-BOOL LLPermissions::setEveryoneBits(const LLUUID& agent, const LLUUID& group, BOOL set, PermissionMask bits)
+bool LLPermissions::setEveryoneBits(const LLUUID& agent, const LLUUID& group, bool set, PermissionMask bits)
 {
-	BOOL ownership = FALSE;
+	bool ownership = false;
 	if((agent.isNull()) || (agent == mOwner)
 	   || ((group == mGroup) && (!mGroup.isNull())))
 	{
 		// The everyone bits can be set by the system, the owner, or a
 		// group member.
-		ownership = TRUE;
+		ownership = true;
 	}
 	if (ownership)
 	{
@@ -441,15 +441,15 @@ BOOL LLPermissions::setEveryoneBits(const LLUUID& agent, const LLUUID& group, BO
 
 // Note: If you attempt to set bits that the creator or owner doesn't allow,
 // the function will succeed, but those bits will not be set.
-BOOL LLPermissions::setNextOwnerBits(const LLUUID& agent, const LLUUID& group, BOOL set, PermissionMask bits)
+bool LLPermissions::setNextOwnerBits(const LLUUID& agent, const LLUUID& group, bool set, PermissionMask bits)
 {
-	BOOL ownership = FALSE;
+	bool ownership = false;
 	if((agent.isNull()) || (agent == mOwner)
 	   || ((group == mGroup) && (!mGroup.isNull())))
 	{
 		// The next owner bits can be set by the system, the owner, or
 		// a group member.
-		ownership = TRUE;
+		ownership = true;
 	}
 	if (ownership)
 	{
@@ -478,7 +478,7 @@ bool LLPermissions::allowOperationBy(PermissionBit op, const LLUUID& requester,
 	{
 		// ...system making request
 		// ...not owned
-		return TRUE;
+		return true;
 	}
 	else if (mIsGroupOwned && (mGroup == requester))
 	{
@@ -513,7 +513,7 @@ LLSD LLPermissions::packMessage() const
 	result["group-mask"]	=	(S32)mMaskGroup;
 	result["everyone-mask"]	=	(S32)mMaskEveryone;
 	result["next-owner-mask"]=	(S32)mMaskNextOwner;
-	result["group-owned"]	= (BOOL)mIsGroupOwned;
+	result["group-owned"]	= (bool)mIsGroupOwned;
 	return result;
 }
 
@@ -531,7 +531,7 @@ void LLPermissions::packMessage(LLMessageSystem* msg) const
 	msg->addU32Fast(_PREHASH_GroupMask,	mMaskGroup );
 	msg->addU32Fast(_PREHASH_EveryoneMask,	mMaskEveryone );
 	msg->addU32Fast(_PREHASH_NextOwnerMask, mMaskNextOwner );
-	msg->addBOOLFast(_PREHASH_GroupOwned, (BOOL)mIsGroupOwned);
+	msg->addBOOLFast(_PREHASH_GroupOwned, mIsGroupOwned);
 }
 
 void LLPermissions::unpackMessage(LLSD perms)
@@ -559,13 +559,13 @@ void LLPermissions::unpackMessage(LLMessageSystem* msg, const char* block, S32 b
 	msg->getU32Fast(block, _PREHASH_GroupMask, mMaskGroup, block_num );
 	msg->getU32Fast(block, _PREHASH_EveryoneMask, mMaskEveryone, block_num );
 	msg->getU32Fast(block, _PREHASH_NextOwnerMask, mMaskNextOwner, block_num );
-	BOOL tmp;
+	bool tmp;
 	msg->getBOOLFast(block, _PREHASH_GroupOwned, tmp, block_num);
-	mIsGroupOwned = (bool)tmp;
+	mIsGroupOwned = tmp;
 }
 
 
-BOOL LLPermissions::importLegacyStream(std::istream& input_stream)
+bool LLPermissions::importLegacyStream(std::istream& input_stream)
 {
 	init(LLUUID::null, LLUUID::null, LLUUID::null, LLUUID::null);
 	const S32 BUFSIZE = 16384;
@@ -661,11 +661,11 @@ BOOL LLPermissions::importLegacyStream(std::istream& input_stream)
 		}
 	}
 	fix();
-	return TRUE;
+	return true;
 }
 
 
-BOOL LLPermissions::exportLegacyStream(std::ostream& output_stream) const
+bool LLPermissions::exportLegacyStream(std::ostream& output_stream) const
 {
 	std::string uuid_str;
 
@@ -701,12 +701,9 @@ BOOL LLPermissions::exportLegacyStream(std::ostream& output_stream) const
 		output_stream <<  "\t\tgroup_owned\t1\n";
 	}
 	output_stream << "\t}\n";
-	return TRUE;
+	return true;
 }
 
-// Deleted LLPermissions::exportFileXML() and LLPermissions::importXML()
-// because I can't find any non-test code references to it. 2009-05-04 JC
-
 bool LLPermissions::operator==(const LLPermissions &rhs) const
 {   
 	return 
@@ -791,21 +788,21 @@ U8 LLAggregatePermissions::getU8() const
 	return byte;
 }
 
-BOOL LLAggregatePermissions::isEmpty() const
+bool LLAggregatePermissions::isEmpty() const
 {
 	for(S32 i = 0; i < PI_END; ++i)
 	{
 		if(mBits[i] != AP_EMPTY)
 		{
-			return FALSE;
+			return false;
 		}
 	}
-	return TRUE;
+	return true;
 }
 
 void LLAggregatePermissions::aggregate(PermissionMask mask)
 {
-	BOOL is_allowed = mask & PERM_COPY;
+	bool is_allowed = mask & PERM_COPY;
 	aggregateBit(PI_COPY, is_allowed);
 	is_allowed = mask & PERM_MODIFY;
 	aggregateBit(PI_MODIFY, is_allowed);
@@ -821,7 +818,7 @@ void LLAggregatePermissions::aggregate(const LLAggregatePermissions& ag)
 	}
 }
 
-void LLAggregatePermissions::aggregateBit(EPermIndex idx, BOOL allowed)
+void LLAggregatePermissions::aggregateBit(EPermIndex idx, bool allowed)
 {
 	//if(AP_SOME == mBits[idx]) return; // P4 branch prediction optimization
 	switch(mBits[idx])
diff --git a/indra/llinventory/llpermissions.h b/indra/llinventory/llpermissions.h
index 27252f7b97..a8acef098a 100644
--- a/indra/llinventory/llpermissions.h
+++ b/indra/llinventory/llpermissions.h
@@ -162,7 +162,7 @@ public:
 	// either the owner id or the group id, and the is_group_owned
 	// parameter is appropriately filled. The values of owner_id and
 	// is_group_owned are not changed if the object is not owned.
-	BOOL getOwnership(LLUUID& owner_id, BOOL& is_group_owned) const;
+	bool getOwnership(LLUUID& owner_id, bool& is_group_owned) const;
 
 	// Gets the 'safe' owner.  This should never return LLUUID::null.
 	// If no group owned, return the agent owner id normally.
@@ -218,7 +218,7 @@ public:
 	// Currently, the only way to have a collection is when an object
 	// has inventory and is then itself rolled up into an inventory
 	// item.
-	BOOL setOwnerAndGroup(const LLUUID& agent, const LLUUID& owner, const LLUUID& group, bool is_atomic);	
+	bool setOwnerAndGroup(const LLUUID& agent, const LLUUID& owner, const LLUUID& group, bool is_atomic);
 
 	// only call this if you know what you're doing
 	// there are usually perm-bit consequences when the 
@@ -239,16 +239,16 @@ public:
 	// owner transfer) then this function will deed the permissions,
 	// set the next owner mask, and return TRUE. Otherwise, no change
 	// is effected, and the function returns FALSE.
-	BOOL deedToGroup(const LLUUID& agent, const LLUUID& group);
+	bool deedToGroup(const LLUUID& agent, const LLUUID& group);
 	// Attempt to set or clear the given bitmask.  Returns TRUE if you
 	// are allowed to modify the permissions.  If you attempt to turn
 	// on bits not allowed by the base bits, the function will return
 	// TRUE, but those bits will not be set.
-	BOOL setBaseBits( const LLUUID& agent, BOOL set, PermissionMask bits);
-	BOOL setOwnerBits( const LLUUID& agent, BOOL set, PermissionMask bits);
-	BOOL setGroupBits( const LLUUID& agent, const LLUUID& group, BOOL set, PermissionMask bits);
-	BOOL setEveryoneBits(const LLUUID& agent, const LLUUID& group, BOOL set, PermissionMask bits);
-	BOOL setNextOwnerBits(const LLUUID& agent, const LLUUID& group, BOOL set, PermissionMask bits);
+	bool setBaseBits( const LLUUID& agent, bool set, PermissionMask bits);
+	bool setOwnerBits( const LLUUID& agent, bool set, PermissionMask bits);
+	bool setGroupBits( const LLUUID& agent, const LLUUID& group, bool set, PermissionMask bits);
+	bool setEveryoneBits(const LLUUID& agent, const LLUUID& group, bool set, PermissionMask bits);
+	bool setNextOwnerBits(const LLUUID& agent, const LLUUID& group, bool set, PermissionMask bits);
 	
 	// This is currently only used in the Viewer to handle calling cards
 	// where the creator is actually used to store the target. Use with care.
@@ -311,8 +311,8 @@ public:
 	void	packMessage(LLMessageSystem* msg) const;
 	void	unpackMessage(LLMessageSystem* msg, const char* block, S32 block_num = 0);
 
-	BOOL	importLegacyStream(std::istream& input_stream);
-	BOOL	exportLegacyStream(std::ostream& output_stream) const;
+	bool	importLegacyStream(std::istream& input_stream);
+	bool	exportLegacyStream(std::ostream& output_stream) const;
 
 	bool operator==(const LLPermissions &rhs) const;
 	bool operator!=(const LLPermissions &rhs) const;
@@ -401,8 +401,8 @@ public:
 	// LSB is to the right
 	U8 getU8() const;
 
-	// return TRUE is the aggregate permissions are empty, otherwise FALSE.
-	BOOL isEmpty() const ;
+	// return true is the aggregate permissions are empty, otherwise false.
+	bool isEmpty() const ;
 
 	// pass in a PERM_COPY, PERM_TRANSFER, etc, and an EValue
 	// enumeration to specifically set that value. Not implemented
@@ -432,7 +432,7 @@ protected:
 		PI_END = 3,
 		PI_COUNT = 3
 	};
-	void aggregateBit(EPermIndex idx, BOOL allowed);
+	void aggregateBit(EPermIndex idx, bool allowed);
 	void aggregateIndex(EPermIndex idx, U8 bits);
 	static EPermIndex perm2PermIndex(PermissionBit bit);
 
diff --git a/indra/llmath/llvolume.cpp b/indra/llmath/llvolume.cpp
index f9306d6bce..5f0c668b33 100644
--- a/indra/llmath/llvolume.cpp
+++ b/indra/llmath/llvolume.cpp
@@ -803,16 +803,16 @@ S32 LLProfile::getNumPoints(const LLProfileParams& params, BOOL path_open,F32 de
 }
 
 
-BOOL LLProfile::generate(const LLProfileParams& params, BOOL path_open,F32 detail, S32 split,
-						 BOOL is_sculpted, S32 sculpt_size)
+bool LLProfile::generate(const LLProfileParams& params, bool path_open,F32 detail, S32 split,
+						 bool is_sculpted, S32 sculpt_size)
 {
 	LL_PROFILE_ZONE_SCOPED_CATEGORY_VOLUME
 
 	if ((!mDirty) && (!is_sculpted))
 	{
-		return FALSE;
+		return false;
 	}
-	mDirty = FALSE;
+	mDirty = false;
 
 	if (detail < MIN_LOD)
 	{
@@ -833,7 +833,7 @@ BOOL LLProfile::generate(const LLProfileParams& params, BOOL path_open,F32 detai
 	if (begin > end - 0.01f)
 	{
 		LL_WARNS() << "LLProfile::generate() assertion failed (begin >= end)" << LL_ENDL;
-		return FALSE;
+		return false;
 	}
 
 	S32 face_num = 0;
@@ -1014,11 +1014,11 @@ BOOL LLProfile::generate(const LLProfileParams& params, BOOL path_open,F32 detai
 			}
 			if (mOpen && !params.getHollow())
 			{
-				addFace(0,mTotal-1,0,LL_FACE_OUTER_SIDE_0, FALSE);
+				addFace(0,mTotal-1,0,LL_FACE_OUTER_SIDE_0, false);
 			}
 			else
 			{
-				addFace(0,mTotal,0,LL_FACE_OUTER_SIDE_0, FALSE);
+				addFace(0,mTotal,0,LL_FACE_OUTER_SIDE_0, false);
 			}
 
 			if (hollow)
@@ -1026,15 +1026,15 @@ BOOL LLProfile::generate(const LLProfileParams& params, BOOL path_open,F32 detai
 				switch (hole_type)
 				{
 				case LL_PCODE_HOLE_SQUARE:
-					addHole(params, TRUE, 2, 0.5f, hollow, 0.5f, split);
+					addHole(params, true, 2, 0.5f, hollow, 0.5f, split);
 					break;
 				case LL_PCODE_HOLE_TRIANGLE:
-					addHole(params, TRUE, 3,  0.5f, hollow, 0.5f, split);
+					addHole(params, true, 3,  0.5f, hollow, 0.5f, split);
 					break;
 				case LL_PCODE_HOLE_CIRCLE:
 				case LL_PCODE_HOLE_SAME:
 				default:
-					addHole(params, FALSE, circle_detail,  0.5f, hollow, 0.5f);
+					addHole(params, false, circle_detail,  0.5f, hollow, 0.5f);
 					break;
 				}
 			}
@@ -1042,11 +1042,11 @@ BOOL LLProfile::generate(const LLProfileParams& params, BOOL path_open,F32 detai
 			// Special case for openness of sphere
 			if ((params.getEnd() - params.getBegin()) < 1.f)
 			{
-				mOpen = TRUE;
+				mOpen = true;
 			}
 			else if (!hollow)
 			{
-				mOpen = FALSE;
+				mOpen = false;
 				mProfile.push_back(mProfile[0]);
 				mTotal++;
 			}
@@ -1064,19 +1064,19 @@ BOOL LLProfile::generate(const LLProfileParams& params, BOOL path_open,F32 detai
 	
 	if ( mOpen) // interior edge caps
 	{
-		addFace(mTotal-1, 2,0.5,LL_FACE_PROFILE_BEGIN, TRUE); 
+		addFace(mTotal-1, 2,0.5,LL_FACE_PROFILE_BEGIN, true);
 
 		if (hollow)
 		{
-			addFace(mTotalOut-1, 2,0.5,LL_FACE_PROFILE_END, TRUE);
+			addFace(mTotalOut-1, 2,0.5,LL_FACE_PROFILE_END, true);
 		}
 		else
 		{
-			addFace(mTotal-2, 2,0.5,LL_FACE_PROFILE_END, TRUE);
+			addFace(mTotal-2, 2,0.5,LL_FACE_PROFILE_END, true);
 		}
 	}
 	
-	return TRUE;
+	return true;
 }
 
 
@@ -1521,14 +1521,14 @@ S32 LLPath::getNumPoints(const LLPathParams& params, F32 detail)
 	return np;
 }
 
-BOOL LLPath::generate(const LLPathParams& params, F32 detail, S32 split,
-					  BOOL is_sculpted, S32 sculpt_size)
+bool LLPath::generate(const LLPathParams& params, F32 detail, S32 split,
+					  bool is_sculpted, S32 sculpt_size)
 {
 	LL_PROFILE_ZONE_SCOPED_CATEGORY_VOLUME
 
 	if ((!mDirty) && (!is_sculpted))
 	{
-		return FALSE;
+		return false;
 	}
 
 	if (detail < MIN_LOD)
@@ -1537,11 +1537,11 @@ BOOL LLPath::generate(const LLPathParams& params, F32 detail, S32 split,
 		detail = MIN_LOD;
 	}
 
-	mDirty = FALSE;
+	mDirty = false;
 	S32 np = 2; // hardcode for line
 
 	mPath.resize(0);
-	mOpen = TRUE;
+	mOpen = true;
 
 	// Is this 0xf0 mask really necessary?  DK 03/02/05
 	switch (params.getCurveType() & 0xf0)
@@ -1601,7 +1601,7 @@ BOOL LLPath::generate(const LLPathParams& params, F32 detail, S32 split,
 			if (params.getEnd() - params.getBegin() >= 0.99f &&
 				params.getScaleX() >= .99f)
 			{
-				mOpen = FALSE;
+				mOpen = false;
 			}
 
 			//genNGon(params, llfloor(MIN_DETAIL_FACES * detail), 4.f, 0.f);
@@ -1645,19 +1645,19 @@ BOOL LLPath::generate(const LLPathParams& params, F32 detail, S32 split,
 		break;
 	};
 
-	if (params.getTwist() != params.getTwistBegin()) mOpen = TRUE;
+	if (params.getTwist() != params.getTwistBegin()) mOpen = true;
 
 	//if ((int(fabsf(params.getTwist() - params.getTwistBegin())*100))%100 != 0) {
-	//	mOpen = TRUE;
+	//	mOpen = true;
 	//}
 	
-	return TRUE;
+	return true;
 }
 
-BOOL LLDynamicPath::generate(const LLPathParams& params, F32 detail, S32 split,
-							 BOOL is_sculpted, S32 sculpt_size)
+bool LLDynamicPath::generate(const LLPathParams& params, F32 detail, S32 split,
+							 bool is_sculpted, S32 sculpt_size)
 {
-	mOpen = TRUE; // Draw end caps
+	mOpen = true; // Draw end caps
 	if (getPathLength() == 0)
 	{
 		// Path hasn't been generated yet.
@@ -1676,7 +1676,7 @@ BOOL LLDynamicPath::generate(const LLPathParams& params, F32 detail, S32 split,
 		}
 	}
 
-	return TRUE;
+	return true;
 }
 
 
diff --git a/indra/llmath/llvolume.h b/indra/llmath/llvolume.h
index c27bc5e821..0158ca9bcd 100644
--- a/indra/llmath/llvolume.h
+++ b/indra/llmath/llvolume.h
@@ -703,9 +703,9 @@ public:
 
 	static S32 getNumPoints(const LLProfileParams& params, BOOL path_open, F32 detail = 1.0f, S32 split = 0,
 				  BOOL is_sculpted = FALSE, S32 sculpt_size = 0);
-	BOOL generate(const LLProfileParams& params, BOOL path_open, F32 detail = 1.0f, S32 split = 0,
-				  BOOL is_sculpted = FALSE, S32 sculpt_size = 0);
-	BOOL isConcave() const								{ return mConcave; }
+	bool generate(const LLProfileParams& params, bool path_open, F32 detail = 1.0f, S32 split = 0,
+				  bool is_sculpted = false, S32 sculpt_size = 0);
+	bool isConcave() const								{ return mConcave; }
 public:
 	struct Face
 	{
@@ -792,8 +792,8 @@ public:
 	static S32 getNumNGonPoints(const LLPathParams& params, S32 sides, F32 offset=0.0f, F32 end_scale = 1.f, F32 twist_scale = 1.f);
 
 	void genNGon(const LLPathParams& params, S32 sides, F32 offset=0.0f, F32 end_scale = 1.f, F32 twist_scale = 1.f);
-	virtual BOOL generate(const LLPathParams& params, F32 detail=1.0f, S32 split = 0,
-						  BOOL is_sculpted = FALSE, S32 sculpt_size = 0);
+	virtual bool generate(const LLPathParams& params, F32 detail=1.0f, S32 split = 0,
+						  bool is_sculpted = false, S32 sculpt_size = 0);
 
 	BOOL isOpen() const						{ return mOpen; }
 	F32 getStep() const						{ return mStep; }
@@ -819,8 +819,8 @@ class LLDynamicPath : public LLPath
 {
 public:
 	LLDynamicPath() : LLPath() { }
-	/*virtual*/ BOOL generate(const LLPathParams& params, F32 detail=1.0f, S32 split = 0,
-							  BOOL is_sculpted = FALSE, S32 sculpt_size = 0);
+	/*virtual*/ bool generate(const LLPathParams& params, F32 detail=1.0f, S32 split = 0,
+							  bool is_sculpted = false, S32 sculpt_size = 0);
 };
 
 // Yet another "face" class - caches volume-specific, but not instance-specific data for faces)
diff --git a/indra/llmessage/llassetstorage.cpp b/indra/llmessage/llassetstorage.cpp
index f38a5e663e..60d95c3367 100644
--- a/indra/llmessage/llassetstorage.cpp
+++ b/indra/llmessage/llassetstorage.cpp
@@ -1020,7 +1020,7 @@ void LLAssetStorage::processUploadComplete(LLMessageSystem *msg, void **user_dat
     LLUUID          uuid;
     S8              asset_type_s8;
     LLAssetType::EType asset_type;
-    BOOL            success = FALSE;
+    bool            success = false;
 
     msg->getUUIDFast(_PREHASH_AssetBlock, _PREHASH_UUID, uuid);
     msg->getS8Fast(_PREHASH_AssetBlock, _PREHASH_Type, asset_type_s8);
diff --git a/indra/llmessage/llmessagereader.h b/indra/llmessage/llmessagereader.h
index 3b77a6bfe4..647f267785 100644
--- a/indra/llmessage/llmessagereader.h
+++ b/indra/llmessage/llmessagereader.h
@@ -52,7 +52,7 @@ class LLMessageReader
 
 	/** All get* methods expect pointers to canonical strings. */
 	virtual void getBinaryData(const char *blockname, const char *varname, void *datap, S32 size, S32 blocknum = 0, S32 max_size = S32_MAX) = 0;
-	virtual void getBOOL(const char *block, const char *var, BOOL &data, S32 blocknum = 0) = 0;
+	virtual void getBOOL(const char *block, const char *var, bool &data, S32 blocknum = 0) = 0;
 	virtual void getS8(const char *block, const char *var, S8 &data, S32 blocknum = 0) = 0;
 	virtual void getU8(const char *block, const char *var, U8 &data, S32 blocknum = 0) = 0;
 	virtual void getS16(const char *block, const char *var, S16 &data, S32 blocknum = 0) = 0;
diff --git a/indra/llmessage/llsdmessagereader.cpp b/indra/llmessage/llsdmessagereader.cpp
index b729ebafa9..d533d6535b 100644
--- a/indra/llmessage/llsdmessagereader.cpp
+++ b/indra/llmessage/llsdmessagereader.cpp
@@ -114,7 +114,7 @@ void LLSDMessageReader::getBinaryData(const char *block, const char *var,
 
 //virtual 
 void LLSDMessageReader::getBOOL(const char *block, const char *var, 
-								BOOL &data, 
+								bool &data,
 								S32 blocknum)
 {
 	data = getLLSD(mMessage, block, var, blocknum);
diff --git a/indra/llmessage/llsdmessagereader.h b/indra/llmessage/llsdmessagereader.h
index 3b3d7fbfbe..4119de6009 100644
--- a/indra/llmessage/llsdmessagereader.h
+++ b/indra/llmessage/llsdmessagereader.h
@@ -46,7 +46,7 @@ public:
 	virtual void getBinaryData(const char *block, const char *var, 
 							   void *datap, S32 size, S32 blocknum = 0, 
 							   S32 max_size = S32_MAX);
-	virtual void getBOOL(const char *block, const char *var, BOOL &data, 
+	virtual void getBOOL(const char *block, const char *var, bool &data,
 						 S32 blocknum = 0);
 	virtual void getS8(const char *block, const char *var, S8 &data, 
 					   S32 blocknum = 0);
diff --git a/indra/llmessage/lltemplatemessagereader.cpp b/indra/llmessage/lltemplatemessagereader.cpp
index 32f79f0546..8a41d5565d 100644
--- a/indra/llmessage/lltemplatemessagereader.cpp
+++ b/indra/llmessage/lltemplatemessagereader.cpp
@@ -284,7 +284,7 @@ void LLTemplateMessageReader::getU8(const char *block, const char *var,
 }
 
 void LLTemplateMessageReader::getBOOL(const char *block, const char *var, 
-										  BOOL &b, S32 blocknum )
+										  bool &b, S32 blocknum )
 {
 	U8 value;
 	getData(block, var, &value, sizeof(U8), blocknum);
diff --git a/indra/llmessage/lltemplatemessagereader.h b/indra/llmessage/lltemplatemessagereader.h
index fcf8f92fa6..88889cd7d2 100644
--- a/indra/llmessage/lltemplatemessagereader.h
+++ b/indra/llmessage/lltemplatemessagereader.h
@@ -47,7 +47,7 @@ public:
 	virtual void getBinaryData(const char *blockname, const char *varname, 
 							   void *datap, S32 size, S32 blocknum = 0, 
 							   S32 max_size = S32_MAX);
-	virtual void getBOOL(const char *block, const char *var, BOOL &data, 
+	virtual void getBOOL(const char *block, const char *var, bool &data,
 						 S32 blocknum = 0);
 	virtual void getS8(const char *block, const char *var, S8 &data, 
 					   S32 blocknum = 0);
diff --git a/indra/llmessage/llxfermanager.cpp b/indra/llmessage/llxfermanager.cpp
index f9b59d7e42..956ecc11a3 100644
--- a/indra/llmessage/llxfermanager.cpp
+++ b/indra/llmessage/llxfermanager.cpp
@@ -757,7 +757,7 @@ void LLXferManager::processFileRequest (LLMessageSystem *mesgsys, void ** /*user
 	LLUUID	uuid;
 	LLAssetType::EType type;
 	S16 type_s16;
-	BOOL b_use_big_packets;
+	bool b_use_big_packets;
 
 	mesgsys->getBOOL("XferID", "UseBigPackets", b_use_big_packets);
 	
@@ -853,7 +853,7 @@ void LLXferManager::processFileRequest (LLMessageSystem *mesgsys, void ** /*user
 		}
 		LL_INFOS("Xfer") << "starting file transfer: " <<  expanded_filename << " to " << mesgsys->getSender() << LL_ENDL;
 
-		BOOL delete_local_on_completion = FALSE;
+		bool delete_local_on_completion = false;
 		mesgsys->getBOOL("XferID", "DeleteOnCompletion", delete_local_on_completion);
 
 		// -1 chunk_size causes it to use the default
diff --git a/indra/llmessage/message.cpp b/indra/llmessage/message.cpp
index 5de29ba66f..5e24061959 100644
--- a/indra/llmessage/message.cpp
+++ b/indra/llmessage/message.cpp
@@ -3673,13 +3673,13 @@ void LLMessageSystem::getU8(const char *block, const char *var, U8 &u,
 				LLMessageStringTable::getInstance()->getString(var), u, blocknum);
 }
 
-void LLMessageSystem::getBOOLFast(const char *block, const char *var, BOOL &b,
+void LLMessageSystem::getBOOLFast(const char *block, const char *var, bool &b,
 								  S32 blocknum)
 {
 	mMessageReader->getBOOL(block, var, b, blocknum);
 }
 
-void LLMessageSystem::getBOOL(const char *block, const char *var, BOOL &b, 
+void LLMessageSystem::getBOOL(const char *block, const char *var, bool &b,
 							  S32 blocknum)
 {
 	getBOOLFast(LLMessageStringTable::getInstance()->getString(block), 
diff --git a/indra/llmessage/message.h b/indra/llmessage/message.h
index e25a9ea7ef..c041a69d79 100644
--- a/indra/llmessage/message.h
+++ b/indra/llmessage/message.h
@@ -599,8 +599,8 @@ public:
 	*/
 	void	getBinaryDataFast(const char *blockname, const char *varname, void *datap, S32 size, S32 blocknum = 0, S32 max_size = S32_MAX);
 	void	getBinaryData(const char *blockname, const char *varname, void *datap, S32 size, S32 blocknum = 0, S32 max_size = S32_MAX);
-	void	getBOOLFast(	const char *block, const char *var, BOOL &data, S32 blocknum = 0);
-	void	getBOOL(	const char *block, const char *var, BOOL &data, S32 blocknum = 0);
+	void	getBOOLFast(	const char *block, const char *var, bool &data, S32 blocknum = 0);
+	void	getBOOL(	const char *block, const char *var, bool &data, S32 blocknum = 0);
 	void	getS8Fast(		const char *block, const char *var, S8 &data, S32 blocknum = 0);
 	void	getS8(		const char *block, const char *var, S8 &data, S32 blocknum = 0);
 	void	getU8Fast(		const char *block, const char *var, U8 &data, S32 blocknum = 0);
diff --git a/indra/llxml/llcontrol.cpp b/indra/llxml/llcontrol.cpp
index 1abf6832fb..2c04147a5a 100644
--- a/indra/llxml/llcontrol.cpp
+++ b/indra/llxml/llcontrol.cpp
@@ -178,10 +178,10 @@ LLSD LLControlVariable::getComparableValue(const LLSD& value)
 	LLSD storable_value;
 	if(TYPE_BOOLEAN == type() && value.isString())
 	{
-		BOOL temp;
+		bool temp;
 		if(LLStringUtil::convertToBOOL(value.asString(), temp))
 		{
-			storable_value = (bool)temp;
+			storable_value = temp;
 		}
 		else
 		{
@@ -859,7 +859,7 @@ U32 LLControlGroup::loadFromFileLegacy(const std::string& filename, BOOL require
 			break;
 		case TYPE_BOOLEAN:
 			{
-				BOOL initial = FALSE;
+				bool initial = false;
 
 				child_nodep->getAttributeBOOL("value", initial);
 				control->set(initial);
diff --git a/indra/llxml/llxmltree.cpp b/indra/llxml/llxmltree.cpp
index ed9c07e1db..4991e99a96 100644
--- a/indra/llxml/llxmltree.cpp
+++ b/indra/llxml/llxmltree.cpp
@@ -199,7 +199,7 @@ void LLXmlTreeNode::addChild(LLXmlTreeNode* child)
 
 // These functions assume that name is already in mAttritrubteKeys
 
-BOOL LLXmlTreeNode::getFastAttributeBOOL(LLStdStringHandle canonical_name, BOOL& value)
+bool LLXmlTreeNode::getFastAttributeBOOL(LLStdStringHandle canonical_name, bool& value)
 {
 	const std::string *s = getAttribute( canonical_name );
 	return s && LLStringUtil::convertToBOOL( *s, value );
@@ -310,7 +310,7 @@ BOOL LLXmlTreeNode::getFastAttributeString(LLStdStringHandle canonical_name, std
 
 //////////////////////////////////////////////////////////////
 
-BOOL LLXmlTreeNode::getAttributeBOOL(const std::string& name, BOOL& value)
+bool LLXmlTreeNode::getAttributeBOOL(const std::string& name, bool& value)
 {
 	LLStdStringHandle canonical_name = LLXmlTree::sAttributeKeys.addString( name );
 	return getFastAttributeBOOL(canonical_name, value);
diff --git a/indra/llxml/llxmltree.h b/indra/llxml/llxmltree.h
index 3e425c3870..5d33e2c660 100644
--- a/indra/llxml/llxmltree.h
+++ b/indra/llxml/llxmltree.h
@@ -105,7 +105,7 @@ public:
 	BOOL hasAttribute( const std::string& name );
 
 	// Fast versions use cannonical_name handlee to entru in LLXmlTree::sAttributeKeys string table
-	BOOL			getFastAttributeBOOL(		LLStdStringHandle cannonical_name, BOOL& value );
+	bool			getFastAttributeBOOL(		LLStdStringHandle cannonical_name, bool& value );
 	BOOL			getFastAttributeU8(			LLStdStringHandle cannonical_name, U8& value );
 	BOOL			getFastAttributeS8(			LLStdStringHandle cannonical_name, S8& value );
 	BOOL			getFastAttributeU16(		LLStdStringHandle cannonical_name, U16& value );
@@ -124,7 +124,7 @@ public:
 	BOOL			getFastAttributeString(		LLStdStringHandle cannonical_name, std::string& value );
 
 	// Normal versions find 'name' in LLXmlTree::sAttributeKeys then call fast versions
-	virtual BOOL		getAttributeBOOL(		const std::string& name, BOOL& value );
+	virtual bool		getAttributeBOOL(		const std::string& name, bool& value );
 	virtual BOOL		getAttributeU8(			const std::string& name, U8& value );
 	virtual BOOL		getAttributeS8(			const std::string& name, S8& value );
 	virtual BOOL		getAttributeU16(		const std::string& name, U16& value );
diff --git a/indra/newview/llagent.cpp b/indra/newview/llagent.cpp
index cdb4130d42..565c00d2ea 100644
--- a/indra/newview/llagent.cpp
+++ b/indra/newview/llagent.cpp
@@ -3430,7 +3430,7 @@ BOOL LLAgent::allowOperation(PermissionBit op,
 	if (!perm.isOwned()) return FALSE;
 
 	// A group member with group_proxy_power can act as owner.
-	BOOL is_group_owned;
+	bool is_group_owned;
 	LLUUID owner_id;
 	perm.getOwnership(owner_id, is_group_owned);
 	LLUUID group_id(perm.getGroup());
@@ -3812,9 +3812,9 @@ void LLAgent::processScriptControlChange(LLMessageSystem *msg, void **)
 	S32 block_count = msg->getNumberOfBlocks("Data");
 	for (S32 block_index = 0; block_index < block_count; block_index++)
 	{
-		BOOL take_controls;
+		bool take_controls;
 		U32	controls;
-		BOOL passon;
+		bool passon;
 		U32 i;
 		msg->getBOOL("Data", "TakeControls", take_controls, block_index);
 		if (take_controls)
diff --git a/indra/newview/llagent.h b/indra/newview/llagent.h
index c1162c1609..2b33cb878b 100644
--- a/indra/newview/llagent.h
+++ b/indra/newview/llagent.h
@@ -78,7 +78,7 @@ struct LLGroupData
 	LLUUID mID;
 	LLUUID mInsigniaID;
 	U64 mPowers;
-	BOOL mAcceptNotices;
+	bool mAcceptNotices;
 	BOOL mListInProfile;
 	S32 mContribution;
 	std::string mName;
diff --git a/indra/newview/llagentwearables.cpp b/indra/newview/llagentwearables.cpp
index 8bd9169c7d..405432fe90 100644
--- a/indra/newview/llagentwearables.cpp
+++ b/indra/newview/llagentwearables.cpp
@@ -623,7 +623,7 @@ BOOL LLAgentWearables::selfHasWearable(LLWearableType::EType type)
 }
 
 // virtual
-void LLAgentWearables::wearableUpdated(LLWearable *wearable, BOOL removed)
+void LLAgentWearables::wearableUpdated(LLWearable *wearable, bool removed)
 {
 	if (isAgentAvatarValid())
 	{
diff --git a/indra/newview/llagentwearables.h b/indra/newview/llagentwearables.h
index e20f5df7fa..2a888573d6 100644
--- a/indra/newview/llagentwearables.h
+++ b/indra/newview/llagentwearables.h
@@ -101,7 +101,7 @@ public:
 	// Setters
 	//--------------------------------------------------------------------
 private:
-	/*virtual*/void	wearableUpdated(LLWearable *wearable, BOOL removed);
+	/*virtual*/void	wearableUpdated(LLWearable *wearable, bool removed);
 public:
 	void			setWearableItem(LLInventoryItem* new_item, LLViewerWearable* wearable, bool do_append = false);
 	void			setWearableOutfit(const LLInventoryItem::item_array_t& items, const std::vector< LLViewerWearable* >& wearables);
diff --git a/indra/newview/llavatarpropertiesprocessor.h b/indra/newview/llavatarpropertiesprocessor.h
index 10cde35f9c..b4a4b60794 100644
--- a/indra/newview/llavatarpropertiesprocessor.h
+++ b/indra/newview/llavatarpropertiesprocessor.h
@@ -105,14 +105,14 @@ struct LLPickData
 	LLUUID agent_id;
 	LLUUID pick_id;
 	LLUUID creator_id;
-	BOOL top_pick;
+	bool top_pick;
 	LLUUID parcel_id;
 	std::string name;
 	std::string desc;
 	LLUUID snapshot_id;
 	LLVector3d pos_global;
 	S32 sort_order;
-	BOOL enabled;
+	bool enabled;
 
 	//used only in read requests
 	std::string user_name;
diff --git a/indra/newview/llbreastmotion.h b/indra/newview/llbreastmotion.h
index 433fece29f..d099257a33 100644
--- a/indra/newview/llbreastmotion.h
+++ b/indra/newview/llbreastmotion.h
@@ -93,12 +93,12 @@ public:
 	// called when a motion is activated
 	// must return TRUE to indicate success, or else
 	// it will be deactivated
-	virtual BOOL onActivate();
+	virtual bool onActivate();
 
 	// called per time step
 	// must return TRUE while it is active, and
 	// must return FALSE when the motion is completed.
-	virtual BOOL onUpdate(F32 time, U8* joint_mask);
+	virtual bool onUpdate(F32 time, U8* joint_mask);
 
 	// called when a motion is deactivated
 	virtual void onDeactivate();
diff --git a/indra/newview/llcommandlineparser.cpp b/indra/newview/llcommandlineparser.cpp
index 794bb78b9c..bc61fac00b 100644
--- a/indra/newview/llcommandlineparser.cpp
+++ b/indra/newview/llcommandlineparser.cpp
@@ -571,7 +571,7 @@ void setControlValueCB(const LLCommandLineParser::token_vector_t& value,
                 std::string token(onevalue(option, value));
             
                 // There's a token. check the string for true/false/1/0 etc.
-                BOOL result = false;
+                bool result = false;
                 bool gotSet = LLStringUtil::convertToBOOL(token, result);
                 if (gotSet)
                 {
diff --git a/indra/newview/llemote.cpp b/indra/newview/llemote.cpp
index b9ef297c00..a051825dae 100644
--- a/indra/newview/llemote.cpp
+++ b/indra/newview/llemote.cpp
@@ -74,7 +74,7 @@ LLMotion::LLMotionInitStatus LLEmote::onInitialize(LLCharacter *character)
 //-----------------------------------------------------------------------------
 // LLEmote::onActivate()
 //-----------------------------------------------------------------------------
-BOOL LLEmote::onActivate()
+bool LLEmote::onActivate()
 {
 	LLVisualParam* default_param = mCharacter->getVisualParam( "Express_Closed_Mouth" );
 	if( default_param )
@@ -89,14 +89,14 @@ BOOL LLEmote::onActivate()
 		mCharacter->updateVisualParams();
 	}
 	
-	return TRUE;
+	return true;
 }
 
 
 //-----------------------------------------------------------------------------
 // LLEmote::onUpdate()
 //-----------------------------------------------------------------------------
-BOOL LLEmote::onUpdate(F32 time, U8* joint_mask)
+bool LLEmote::onUpdate(F32 time, U8* joint_mask)
 {
 	if( mParam )
 	{
@@ -116,7 +116,7 @@ BOOL LLEmote::onUpdate(F32 time, U8* joint_mask)
 		mCharacter->updateVisualParams();
 	}
 
-	return TRUE;
+	return true;
 }
 
 
diff --git a/indra/newview/llemote.h b/indra/newview/llemote.h
index 9ea6be6b1e..1b15445e4b 100644
--- a/indra/newview/llemote.h
+++ b/indra/newview/llemote.h
@@ -96,12 +96,12 @@ public:
 	// called when a motion is activated
 	// must return TRUE to indicate success, or else
 	// it will be deactivated 
-	virtual BOOL onActivate();
+	virtual bool onActivate();
 
 	// called per time step
 	// must return TRUE while it is active, and
 	// must return FALSE when the motion is completed.
-	virtual BOOL onUpdate(F32 time, U8* joint_mask);
+	virtual bool onUpdate(F32 time, U8* joint_mask);
 
 	// called when a motion is deactivated
 	virtual void onDeactivate();
diff --git a/indra/newview/llfloaterbuycontents.cpp b/indra/newview/llfloaterbuycontents.cpp
index 440ec06c4e..f9dfa0334f 100644
--- a/indra/newview/llfloaterbuycontents.cpp
+++ b/indra/newview/llfloaterbuycontents.cpp
@@ -170,7 +170,7 @@ void LLFloaterBuyContents::inventoryChanged(LLViewerObject* obj,
 	buy_btn->setEnabled(FALSE);
 
 	LLUUID owner_id;
-	BOOL is_group_owned;
+	bool is_group_owned;
 	LLAssetType::EType asset_type;
 	LLInventoryType::EType inv_type;
 	S32 wearable_count = 0;
diff --git a/indra/newview/llfloaterland.cpp b/indra/newview/llfloaterland.cpp
index 9c4c9b3e59..07bd77460f 100644
--- a/indra/newview/llfloaterland.cpp
+++ b/indra/newview/llfloaterland.cpp
@@ -1649,12 +1649,12 @@ void LLPanelLandObjects::processParcelObjectOwnersReply(LLMessageSystem *msg, vo
 	S32 rows = msg->getNumberOfBlocksFast(_PREHASH_Data);
 	//uuid_list_t return_ids;
 	LLUUID	owner_id;
-	BOOL	is_group_owned;
+	bool	is_group_owned;
 	S32		object_count;
 	U32		most_recent_time = 0;
-	BOOL	is_online;
+	bool	is_online;
 	std::string object_count_str;
-	//BOOL b_need_refresh = FALSE;
+	//bool b_need_refresh = false;
 
 	// If we were waiting for the first reply, clear the "Searching..." text.
 	if (self->mFirstReply)
diff --git a/indra/newview/llfloaterpay.cpp b/indra/newview/llfloaterpay.cpp
index 94261b2e4e..bab6631d54 100644
--- a/indra/newview/llfloaterpay.cpp
+++ b/indra/newview/llfloaterpay.cpp
@@ -388,7 +388,7 @@ void LLFloaterPay::payViaObject(money_callback callback, LLSafeHandle<LLObjectSe
 	msg->setHandlerFuncFast(_PREHASH_PayPriceReply, processPayPriceReply,(void **)floater);
 	
 	LLUUID owner_id;
-	BOOL is_group = FALSE;
+	bool is_group = false;
 	node->mPermissions->getOwnership(owner_id, is_group);
 	
 	floater->getChild<LLUICtrl>("object_name_text")->setValue(node->mName);
@@ -505,7 +505,7 @@ void LLFloaterPay::onGive(give_money_ptr info)
     if (amount > PAY_AMOUNT_NOTIFICATION && gStatusBar && gStatusBar->getBalance() > amount)
     {
         LLUUID payee_id = LLUUID::null;
-        BOOL is_group = false;
+        bool is_group = false;
         if (floater->mObjectSelection.notNull())
         {
             LLSelectNode* node = floater->mObjectSelection->getFirstRootNode();
diff --git a/indra/newview/llfloaterregioninfo.cpp b/indra/newview/llfloaterregioninfo.cpp
index d4eb40ff92..1e106ed3b1 100644
--- a/indra/newview/llfloaterregioninfo.cpp
+++ b/indra/newview/llfloaterregioninfo.cpp
@@ -437,7 +437,7 @@ void LLFloaterRegionInfo::processRegionInfo(LLMessageSystem* msg)
 	F32 water_height;
 	F32 terrain_raise_limit;
 	F32 terrain_lower_limit;
-	BOOL use_estate_sun;
+	bool use_estate_sun;
 	F32 sun_hour;
 	msg->getString("RegionInfo", "SimName", sim_name);
 	msg->getU8("RegionInfo", "MaxAgents", agent_limit);
diff --git a/indra/newview/llgroupmgr.cpp b/indra/newview/llgroupmgr.cpp
index a9e5e55451..5683a690f1 100644
--- a/indra/newview/llgroupmgr.cpp
+++ b/indra/newview/llgroupmgr.cpp
@@ -980,7 +980,7 @@ void LLGroupMgr::processGroupMembersReply(LLMessageSystem* msg, void** data)
 		std::string online_status;
 		std::string title;
 		U64 agent_powers = 0;
-		BOOL is_owner = FALSE;
+		bool is_owner = false;
 
 		S32 num_members = msg->getNumberOfBlocksFast(_PREHASH_MemberData);
 		for (S32 i = 0; i < num_members; i++)
@@ -1075,7 +1075,7 @@ void LLGroupMgr::processGroupPropertiesReply(LLMessageSystem* msg, void** data)
 	LLUUID group_id;
 	std::string	name;
 	std::string	charter;
-	BOOL	show_in_list = FALSE;
+	bool	show_in_list = false;
 	LLUUID	founder_id;
 	U64		powers_mask = GP_NO_POWERS;
 	S32		money = 0;
@@ -1083,11 +1083,11 @@ void LLGroupMgr::processGroupPropertiesReply(LLMessageSystem* msg, void** data)
 	LLUUID	insignia_id;
 	LLUUID	owner_role;
 	U32		membership_fee = 0;
-	BOOL	open_enrollment = FALSE;
+	bool	open_enrollment = false;
 	S32		num_group_members = 0;
 	S32		num_group_roles = 0;
-	BOOL	allow_publish = FALSE;
-	BOOL	mature = FALSE;
+	bool	allow_publish = false;
+	bool	mature = false;
 
 	msg->getUUIDFast(_PREHASH_GroupData, _PREHASH_GroupID, group_id );
 	msg->getUUIDFast(_PREHASH_GroupData, _PREHASH_FounderID, founder_id);	
@@ -1389,7 +1389,7 @@ void LLGroupMgr::processEjectGroupMemberReply(LLMessageSystem* msg, void ** data
 	LL_DEBUGS("GrpMgr") << "processEjectGroupMemberReply" << LL_ENDL;
 	LLUUID group_id;
 	msg->getUUIDFast(_PREHASH_GroupData, _PREHASH_GroupID, group_id);
-	BOOL success;
+	bool success;
 	msg->getBOOLFast(_PREHASH_EjectData, _PREHASH_Success, success);
 
 	// If we had a failure, the group panel needs to be updated.
@@ -1404,7 +1404,7 @@ void LLGroupMgr::processJoinGroupReply(LLMessageSystem* msg, void ** data)
 {
 	LL_DEBUGS("GrpMgr") << "processJoinGroupReply" << LL_ENDL;
 	LLUUID group_id;
-	BOOL success;
+	bool success;
 	msg->getUUIDFast(_PREHASH_GroupData, _PREHASH_GroupID, group_id);
 	msg->getBOOLFast(_PREHASH_GroupData, _PREHASH_Success, success);
 
@@ -1424,7 +1424,7 @@ void LLGroupMgr::processLeaveGroupReply(LLMessageSystem* msg, void ** data)
 {
 	LL_DEBUGS("GrpMgr") << "processLeaveGroupReply" << LL_ENDL;
 	LLUUID group_id;
-	BOOL success;
+	bool success;
 	msg->getUUIDFast(_PREHASH_GroupData, _PREHASH_GroupID, group_id);
 	msg->getBOOLFast(_PREHASH_GroupData, _PREHASH_Success, success);
 
@@ -1443,7 +1443,7 @@ void LLGroupMgr::processLeaveGroupReply(LLMessageSystem* msg, void ** data)
 void LLGroupMgr::processCreateGroupReply(LLMessageSystem* msg, void ** data)
 {
 	LLUUID group_id;
-	BOOL success;
+	bool success;
 	std::string message;
 
 	msg->getUUIDFast(_PREHASH_ReplyData, _PREHASH_GroupID, group_id );
diff --git a/indra/newview/llgroupmgr.h b/indra/newview/llgroupmgr.h
index 0d25e8fb22..bd61798543 100644
--- a/indra/newview/llgroupmgr.h
+++ b/indra/newview/llgroupmgr.h
@@ -221,7 +221,7 @@ struct LLGroupTitle
 {
 	std::string mTitle;
 	LLUUID		mRoleID;
-	BOOL		mSelected;
+	bool		mSelected;
 };
 
 class LLGroupMgrGroupData
diff --git a/indra/newview/llpanelgroupnotices.cpp b/indra/newview/llpanelgroupnotices.cpp
index 54121c2656..b007291179 100644
--- a/indra/newview/llpanelgroupnotices.cpp
+++ b/indra/newview/llpanelgroupnotices.cpp
@@ -501,7 +501,7 @@ void LLPanelGroupNotices::processNotices(LLMessageSystem* msg)
 	std::string subj;
 	std::string name;
 	U32 timestamp;
-	BOOL has_attachment;
+	bool has_attachment;
 	U8 asset_type;
 
 	S32 i=0;
diff --git a/indra/newview/llphysicsmotion.cpp b/indra/newview/llphysicsmotion.cpp
index 03a02ba26f..98b8919660 100644
--- a/indra/newview/llphysicsmotion.cpp
+++ b/indra/newview/llphysicsmotion.cpp
@@ -124,7 +124,7 @@ public:
 
         ~LLPhysicsMotion() {}
 
-        BOOL onUpdate(F32 time);
+        bool onUpdate(F32 time);
 
         LLPointer<LLJointState> getJointState() 
         {
@@ -250,9 +250,9 @@ LLPhysicsMotionController::~LLPhysicsMotionController()
         }
 }
 
-BOOL LLPhysicsMotionController::onActivate() 
-{ 
-        return TRUE; 
+bool LLPhysicsMotionController::onActivate()
+{
+        return true;
 }
 
 void LLPhysicsMotionController::onDeactivate() 
@@ -451,16 +451,16 @@ F32 LLPhysicsMotion::calculateAcceleration_local(const F32 velocity_local, const
         return smoothed_acceleration_local;
 }
 
-BOOL LLPhysicsMotionController::onUpdate(F32 time, U8* joint_mask)
+bool LLPhysicsMotionController::onUpdate(F32 time, U8* joint_mask)
 {
     LL_PROFILE_ZONE_SCOPED_CATEGORY_AVATAR;
         // Skip if disabled globally.
         if (!gSavedSettings.getBOOL("AvatarPhysics"))
         {
-                return TRUE;
+                return true;
         }
         
-        BOOL update_visuals = FALSE;
+        BOOL update_visuals = false;
         for (motion_vec_t::iterator iter = mMotions.begin();
              iter != mMotions.end();
              ++iter)
@@ -472,21 +472,21 @@ BOOL LLPhysicsMotionController::onUpdate(F32 time, U8* joint_mask)
         if (update_visuals)
                 mCharacter->updateVisualParams();
         
-        return TRUE;
+        return true;
 }
 
 // Return TRUE if character has to update visual params.
-BOOL LLPhysicsMotion::onUpdate(F32 time)
+bool LLPhysicsMotion::onUpdate(F32 time)
 {
         // static FILE *mFileWrite = fopen("c:\\temp\\avatar_data.txt","w");
         
         if (!mParamDriver)
-                return FALSE;
+                return false;
 
         if (!mLastTime || mLastTime >= time)
         {
                 mLastTime = time;
-                return FALSE;
+                return false;
         }
 
         ////////////////////////////////////////////////////////////////////////////////
@@ -499,7 +499,7 @@ BOOL LLPhysicsMotion::onUpdate(F32 time)
         if (time_delta > 1.0)
         {
                 mLastTime = time;
-                return FALSE;
+                return false;
         }
 
         // Higher LOD is better.  This controls the granularity
@@ -507,7 +507,7 @@ BOOL LLPhysicsMotion::onUpdate(F32 time)
         const F32 lod_factor = LLVOAvatar::sPhysicsLODFactor;
         if (lod_factor == 0)
         {
-                return TRUE;
+                return true;
         }
 
         LLJoint *joint = mJointState->getJoint();
@@ -520,7 +520,7 @@ BOOL LLPhysicsMotion::onUpdate(F32 time)
 		const F32 behavior_drag = getParamValue(DRAG);
 		F32 behavior_maxeffect = getParamValue(MAX_EFFECT);
 		
-		const BOOL physics_test = FALSE; // Enable this to simulate bouncing on all parts.
+		const BOOL physics_test = false; // Enable this to simulate bouncing on all parts.
         
         if (physics_test)
                 behavior_maxeffect = 1.0f;
@@ -548,7 +548,7 @@ BOOL LLPhysicsMotion::onUpdate(F32 time)
 	// End velocity and acceleration
 	////////////////////////////////////////////////////////////////////////////////
 	
-	BOOL update_visuals = FALSE;
+	bool update_visuals = false;
 	
 	// Break up the physics into a bunch of iterations so that differing framerates will show
 	// roughly the same behavior.
diff --git a/indra/newview/llphysicsmotion.h b/indra/newview/llphysicsmotion.h
index a3b8e293f1..976f23cd44 100644
--- a/indra/newview/llphysicsmotion.h
+++ b/indra/newview/llphysicsmotion.h
@@ -93,12 +93,12 @@ public:
 	// called when a motion is activated
 	// must return TRUE to indicate success, or else
 	// it will be deactivated
-	virtual BOOL onActivate();
+	virtual bool onActivate();
 
 	// called per time step
 	// must return TRUE while it is active, and
 	// must return FALSE when the motion is completed.
-	virtual BOOL onUpdate(F32 time, U8* joint_mask);
+	virtual bool onUpdate(F32 time, U8* joint_mask);
 
 	// called when a motion is deactivated
 	virtual void onDeactivate();
diff --git a/indra/newview/llpreviewscript.cpp b/indra/newview/llpreviewscript.cpp
index aceb8539d2..b0b9e00d1b 100644
--- a/indra/newview/llpreviewscript.cpp
+++ b/indra/newview/llpreviewscript.cpp
@@ -2367,11 +2367,11 @@ void LLLiveLSLEditor::processScriptRunningReply(LLMessageSystem* msg, void**)
 	if(instance)
 	{
 		instance->mHaveRunningInfo = TRUE;
-		BOOL running;
+		bool running;
 		msg->getBOOLFast(_PREHASH_Script, _PREHASH_Running, running);
 		LLCheckBoxCtrl* runningCheckbox = instance->getChild<LLCheckBoxCtrl>("running");
 		runningCheckbox->set(running);
-		BOOL mono;
+		bool mono;
 		msg->getBOOLFast(_PREHASH_Script, "Mono", mono);
 		LLCheckBoxCtrl* monoCheckbox = instance->getChild<LLCheckBoxCtrl>("mono");
 		monoCheckbox->setEnabled(instance->getIsModifiable() && have_script_upload_cap(object_id));
diff --git a/indra/newview/llregioninfomodel.h b/indra/newview/llregioninfomodel.h
index baeff82fef..2aea654de7 100644
--- a/indra/newview/llregioninfomodel.h
+++ b/indra/newview/llregioninfomodel.h
@@ -70,7 +70,7 @@ public:
 	F32			mTerrainLowerLimit;
 	F32			mSunHour; // 6..30
 
-	BOOL		mUseEstateSun;
+	bool		mUseEstateSun;
 
 	std::string	mSimName;
 	std::string	mSimType;
diff --git a/indra/newview/llselectmgr.cpp b/indra/newview/llselectmgr.cpp
index 61508f8648..4c7a440231 100644
--- a/indra/newview/llselectmgr.cpp
+++ b/indra/newview/llselectmgr.cpp
@@ -6022,7 +6022,7 @@ void LLSelectMgr::processObjectPropertiesFamily(LLMessageSystem* msg, void** use
 // static
 void LLSelectMgr::processForceObjectSelect(LLMessageSystem* msg, void**)
 {
-	BOOL reset_list;
+	bool reset_list;
 	msg->getBOOL("Header", "ResetList", reset_list);
 
 	if (reset_list)
@@ -6858,14 +6858,14 @@ void LLSelectNode::saveTextureScaleRatios(LLRender::eTexIndex index_to_query)
 BOOL LLSelectNode::allowOperationOnNode(PermissionBit op, U64 group_proxy_power) const
 {
 	// Extract ownership.
-	BOOL object_is_group_owned = FALSE;
+	bool object_is_group_owned = false;
 	LLUUID object_owner_id;
 	mPermissions->getOwnership(object_owner_id, object_is_group_owned);
 
 	// Operations on invalid or public objects is not allowed.
 	if (!mObject || (mObject->isDead()) || !mPermissions->isOwned())
 	{
-		return FALSE;
+		return false;
 	}
 
 	// The transfer permissions can never be given through proxy.
@@ -6875,7 +6875,7 @@ BOOL LLSelectNode::allowOperationOnNode(PermissionBit op, U64 group_proxy_power)
 		if ( !object_is_group_owned 
 			&& (gAgent.getID() == object_owner_id) )
 		{
-			return TRUE;
+			return true;
 		}
 		else
 		{
@@ -6891,7 +6891,7 @@ BOOL LLSelectNode::allowOperationOnNode(PermissionBit op, U64 group_proxy_power)
 		// no proxy allowed.
 		if (mObject->isAttachment() && object_owner_id != gAgent.getID())
 		{
-			return FALSE;
+			return false;
 		}
 	}
 
@@ -6904,7 +6904,7 @@ BOOL LLSelectNode::allowOperationOnNode(PermissionBit op, U64 group_proxy_power)
 	// Gods can always operate.
 	if (gAgent.isGodlike())
 	{
-		return TRUE;
+		return true;
 	}
 
 	// Check if the agent is in the same group as the object.
diff --git a/indra/newview/llsettingsvo.cpp b/indra/newview/llsettingsvo.cpp
index 4df80cb2b9..fb5ca2c3f4 100644
--- a/indra/newview/llsettingsvo.cpp
+++ b/indra/newview/llsettingsvo.cpp
@@ -227,8 +227,8 @@ void LLSettingsVOBase::updateInventoryItem(const LLSettingsBase::ptr_t &settings
         if (settings->getFlag(LLSettingsBase::FLAG_NOTRANS) && new_item->getPermissions().allowOperationBy(PERM_TRANSFER, gAgent.getID()))
         {
             LLPermissions perm(inv_item->getPermissions());
-            perm.setBaseBits(LLUUID::null, FALSE, PERM_TRANSFER);
-            perm.setOwnerBits(LLUUID::null, FALSE, PERM_TRANSFER);
+            perm.setBaseBits(LLUUID::null, false, PERM_TRANSFER);
+            perm.setOwnerBits(LLUUID::null, false, PERM_TRANSFER);
             new_item->setPermissions(perm);
             need_update |= true;
         }
diff --git a/indra/newview/llsidepaneliteminfo.cpp b/indra/newview/llsidepaneliteminfo.cpp
index 298fac1bfe..7feacd530d 100644
--- a/indra/newview/llsidepaneliteminfo.cpp
+++ b/indra/newview/llsidepaneliteminfo.cpp
@@ -957,7 +957,7 @@ void LLSidepanelItemInfo::updatePermissions()
 	LLViewerInventoryItem* item = findItem();
 	if(!item) return;
 
-	BOOL is_group_owned;
+	bool is_group_owned;
 	LLUUID owner_id;
 	LLUUID group_id;
 	LLPermissions perm(item->getPermissions());
diff --git a/indra/newview/llviewergesture.cpp b/indra/newview/llviewergesture.cpp
index f30279d1e9..ef63ef41e5 100644
--- a/indra/newview/llviewergesture.cpp
+++ b/indra/newview/llviewergesture.cpp
@@ -70,37 +70,37 @@ LLViewerGesture::LLViewerGesture(const LLViewerGesture &rhs)
 {
 }
 
-BOOL LLViewerGesture::trigger(KEY key, MASK mask)
+bool LLViewerGesture::trigger(KEY key, MASK mask)
 {
 	if (mKey == key && mMask == mask)
 	{
-		doTrigger( TRUE );
-		return TRUE;
+		doTrigger( true );
+		return true;
 	}
 	else
 	{
-		return FALSE;
+		return false;
 	}
 }
 
 
-BOOL LLViewerGesture::trigger(const std::string &trigger_string)
+bool LLViewerGesture::trigger(const std::string &trigger_string)
 {
 	// Assumes trigger_string is lowercase
 	if (mTriggerLower == trigger_string)
 	{
-		doTrigger( FALSE );
-		return TRUE;
+		doTrigger( false );
+		return true;
 	}
 	else
 	{
-		return FALSE;
+		return false;
 	}
 }
 
 
 // private
-void LLViewerGesture::doTrigger( BOOL send_chat )
+void LLViewerGesture::doTrigger( bool send_chat )
 {
 	if (mSoundItemID != LLUUID::null)
 	{
@@ -132,7 +132,7 @@ void LLViewerGesture::doTrigger( BOOL send_chat )
 		// Don't play nodding animation, since that might not blend
 		// with the gesture animation.
 		(LLFloaterReg::getTypedInstance<LLFloaterIMNearbyChat>("nearby_chat"))->
-				sendChatFromViewer(mOutputString, CHAT_TYPE_NORMAL, FALSE);
+				sendChatFromViewer(mOutputString, CHAT_TYPE_NORMAL, false);
 	}
 }
 
@@ -140,7 +140,7 @@ void LLViewerGesture::doTrigger( BOOL send_chat )
 LLViewerGestureList::LLViewerGestureList()
 :	LLGestureList()
 {
-	mIsLoaded = FALSE;
+	mIsLoaded = false;
 }
 
 
@@ -154,7 +154,7 @@ LLGesture *LLViewerGestureList::create_gesture(U8 **buffer, S32 max_size)
 // See if the prefix matches any gesture.  If so, return TRUE
 // and place the full text of the gesture trigger into
 // output_str
-BOOL LLViewerGestureList::matchPrefix(const std::string& in_str, std::string* out_str)
+bool LLViewerGestureList::matchPrefix(const std::string& in_str, std::string* out_str)
 {
 	S32 in_len = in_str.length();
 
@@ -177,10 +177,10 @@ BOOL LLViewerGestureList::matchPrefix(const std::string& in_str, std::string* ou
 		if (in_str_lc == trigger_trunc)
 		{
 			*out_str = trigger;
-			return TRUE;
+			return true;
 		}
 	}
-	return FALSE;
+	return false;
 }
 
 
diff --git a/indra/newview/llviewergesture.h b/indra/newview/llviewergesture.h
index 8b621850ea..fea0778b1c 100644
--- a/indra/newview/llviewergesture.h
+++ b/indra/newview/llviewergesture.h
@@ -46,12 +46,12 @@ public:
 	LLViewerGesture(const LLViewerGesture &gesture);
 
 	// Triggers if a key/mask matches it
-	virtual BOOL trigger(KEY key, MASK mask);
+	virtual bool trigger(KEY key, MASK mask);
 
 	// Triggers if case-insensitive substring matches (assumes string is lowercase)
-	virtual BOOL trigger(const std::string &string);
+	virtual bool trigger(const std::string &string);
 
-	void doTrigger( BOOL send_chat );
+	void doTrigger( bool send_chat );
 
 protected:
 	static const F32	SOUND_VOLUME;
@@ -63,14 +63,14 @@ public:
 	LLViewerGestureList();
 
 	//void requestFromServer();
-	BOOL getIsLoaded() { return mIsLoaded; }
+	bool getIsLoaded() { return mIsLoaded; }
 
 	//void requestResetFromServer( BOOL is_male );
 
 	// See if the prefix matches any gesture.  If so, return TRUE
 	// and place the full text of the gesture trigger into
 	// output_str
-	BOOL matchPrefix(const std::string& in_str, std::string* out_str);
+	bool matchPrefix(const std::string& in_str, std::string* out_str);
 
 	static void xferCallback(void *data, S32 size, void** /*user_data*/, S32 status);
 
@@ -78,7 +78,7 @@ protected:
 	LLGesture *create_gesture(U8 **buffer, S32 max_size);
 
 protected:
-	BOOL mIsLoaded;
+	bool mIsLoaded;
 };
 
 extern LLViewerGestureList gGestureList;
diff --git a/indra/newview/llviewerjoint.cpp b/indra/newview/llviewerjoint.cpp
index 9653e80b53..22d70d482b 100644
--- a/indra/newview/llviewerjoint.cpp
+++ b/indra/newview/llviewerjoint.cpp
@@ -67,7 +67,7 @@ LLViewerJoint::~LLViewerJoint()
 //--------------------------------------------------------------------
 // render()
 //--------------------------------------------------------------------
-U32 LLViewerJoint::render( F32 pixelArea, BOOL first_pass, BOOL is_dummy )
+U32 LLViewerJoint::render( F32 pixelArea, bool first_pass, bool is_dummy )
 {
 	stop_glerror();
 
@@ -107,13 +107,13 @@ U32 LLViewerJoint::render( F32 pixelArea, BOOL first_pass, BOOL is_dummy )
 				// second pass writes to z buffer only
 				gGL.setColorMask(false, false);
 				{
-					triangle_count += drawShape( pixelArea, FALSE, is_dummy  );
+					triangle_count += drawShape( pixelArea, false, is_dummy  );
 				}
 				// third past respects z buffer and writes color
 				gGL.setColorMask(true, false);
 				{
 					LLGLDepthTest gls_depth(GL_TRUE, GL_FALSE);
-					triangle_count += drawShape( pixelArea, FALSE, is_dummy  );
+					triangle_count += drawShape( pixelArea, false, is_dummy  );
 				}
 			}
 			else
@@ -127,7 +127,7 @@ U32 LLViewerJoint::render( F32 pixelArea, BOOL first_pass, BOOL is_dummy )
 				// Render Outside (write to the Z buffer)
 				glCullFace(GL_BACK);
 				{
-					triangle_count += drawShape( pixelArea, FALSE, is_dummy  );
+					triangle_count += drawShape( pixelArea, false, is_dummy  );
 				}
 			}
 		}
@@ -149,7 +149,7 @@ U32 LLViewerJoint::render( F32 pixelArea, BOOL first_pass, BOOL is_dummy )
 		F32 jointLOD = joint->getLOD();
 		if (pixelArea >= jointLOD || sDisableLOD)
 		{
-			triangle_count += joint->render( pixelArea, TRUE, is_dummy );
+			triangle_count += joint->render( pixelArea, true, is_dummy );
 
 			if (jointLOD != DEFAULT_AVATAR_JOINT_LOD)
 			{
@@ -164,7 +164,7 @@ U32 LLViewerJoint::render( F32 pixelArea, BOOL first_pass, BOOL is_dummy )
 //--------------------------------------------------------------------
 // drawShape()
 //--------------------------------------------------------------------
-U32 LLViewerJoint::drawShape( F32 pixelArea, BOOL first_pass, BOOL is_dummy )
+U32 LLViewerJoint::drawShape( F32 pixelArea, bool first_pass, bool is_dummy )
 {
 	return 0;
 }
diff --git a/indra/newview/llviewerjoint.h b/indra/newview/llviewerjoint.h
index abe11bbf5c..dec6b3d2a7 100644
--- a/indra/newview/llviewerjoint.h
+++ b/indra/newview/llviewerjoint.h
@@ -54,11 +54,11 @@ public:
 	// Traverses the entire joint hierarchy, setting up
 	// transforms and calling the drawShape().
 	// Derived classes may add text/graphic output.
-	virtual U32 render( F32 pixelArea, BOOL first_pass = TRUE, BOOL is_dummy = FALSE );	// Returns triangle count
+	virtual U32 render( F32 pixelArea, bool first_pass = true, bool is_dummy = false );	// Returns triangle count
 
 	// Draws the shape attached to a joint.
 	// Called by render().
-	virtual U32 drawShape( F32 pixelArea, BOOL first_pass = TRUE, BOOL is_dummy = FALSE );
+	virtual U32 drawShape( F32 pixelArea, bool first_pass = true, bool is_dummy = false );
 	virtual void drawNormals() {}
 };
 
diff --git a/indra/newview/llviewerjointattachment.cpp b/indra/newview/llviewerjointattachment.cpp
index 55fa2682e1..eed482b598 100644
--- a/indra/newview/llviewerjointattachment.cpp
+++ b/indra/newview/llviewerjointattachment.cpp
@@ -71,15 +71,15 @@ LLViewerJointAttachment::~LLViewerJointAttachment()
 //-----------------------------------------------------------------------------
 // isTransparent()
 //-----------------------------------------------------------------------------
-BOOL LLViewerJointAttachment::isTransparent()
+bool LLViewerJointAttachment::isTransparent()
 {
-	return FALSE;
+	return false;
 }
 
 //-----------------------------------------------------------------------------
 // drawShape()
 //-----------------------------------------------------------------------------
-U32 LLViewerJointAttachment::drawShape( F32 pixelArea, BOOL first_pass, BOOL is_dummy )
+U32 LLViewerJointAttachment::drawShape( F32 pixelArea, bool first_pass, bool is_dummy )
 {
 	if (LLVOAvatar::sShowAttachmentPoints)
 	{
@@ -103,7 +103,7 @@ void LLViewerJointAttachment::setupDrawable(LLViewerObject *object)
 		return;
 	if (object->mDrawable->isActive())
 	{
-		object->mDrawable->makeStatic(FALSE);
+		object->mDrawable->makeStatic(false);
 	}
 
 	object->mDrawable->mXform.setParent(getXform()); // LLViewerJointAttachment::lazyAttach
@@ -162,7 +162,7 @@ void LLViewerJointAttachment::setupDrawable(LLViewerObject *object)
 //-----------------------------------------------------------------------------
 // addObject()
 //-----------------------------------------------------------------------------
-BOOL LLViewerJointAttachment::addObject(LLViewerObject* object)
+bool LLViewerJointAttachment::addObject(LLViewerObject* object)
 {
 	object->extractAttachmentItemID();
 
@@ -184,7 +184,7 @@ BOOL LLViewerJointAttachment::addObject(LLViewerObject* object)
 
 		// If this happens to be attached to self, then detach.
 		LLVOAvatarSelf::detachAttachmentIntoInventory(object->getAttachmentItemID());
-		return FALSE;
+		return false;
 	}
 
 	mAttachedObjects.push_back(object);
@@ -194,7 +194,7 @@ BOOL LLViewerJointAttachment::addObject(LLViewerObject* object)
 	{
 		if (object->mText.notNull())
 		{
-			object->mText->setOnHUDAttachment(TRUE);
+			object->mText->setOnHUDAttachment(true);
 		}
 		LLViewerObject::const_child_list_t& child_list = object->getChildren();
 		for (LLViewerObject::child_list_t::const_iterator iter = child_list.begin();
@@ -203,14 +203,14 @@ BOOL LLViewerJointAttachment::addObject(LLViewerObject* object)
 			LLViewerObject* childp = *iter;
 			if (childp && childp->mText.notNull())
 			{
-				childp->mText->setOnHUDAttachment(TRUE);
+				childp->mText->setOnHUDAttachment(true);
 			}
 		}
 	}
 	calcLOD();
-	mUpdateXform = TRUE;
+	mUpdateXform = true;
 	
-	return TRUE;
+	return true;
 }
 
 //-----------------------------------------------------------------------------
@@ -317,7 +317,7 @@ void LLViewerJointAttachment::removeObject(LLViewerObject *object)
 //-----------------------------------------------------------------------------
 // setAttachmentVisibility()
 //-----------------------------------------------------------------------------
-void LLViewerJointAttachment::setAttachmentVisibility(BOOL visible)
+void LLViewerJointAttachment::setAttachmentVisibility(bool visible)
 {
 	for (attachedobjs_vec_t::const_iterator iter = mAttachedObjects.begin();
 		 iter != mAttachedObjects.end();
@@ -435,7 +435,7 @@ bool LLViewerJointAttachment::updateLOD(F32 pixel_area, bool activate)
 	return res;
 }
 
-BOOL LLViewerJointAttachment::isObjectAttached(const LLViewerObject *viewer_object) const
+bool LLViewerJointAttachment::isObjectAttached(const LLViewerObject *viewer_object) const
 {
 	for (attachedobjs_vec_t::const_iterator iter = mAttachedObjects.begin();
 		 iter != mAttachedObjects.end();
@@ -444,10 +444,10 @@ BOOL LLViewerJointAttachment::isObjectAttached(const LLViewerObject *viewer_obje
 		const LLViewerObject* attached_object = iter->get();
 		if (attached_object == viewer_object)
 		{
-			return TRUE;
+			return true;
 		}
 	}
-	return FALSE;
+	return false;
 }
 
 const LLViewerObject *LLViewerJointAttachment::getAttachedObject(const LLUUID &object_id) const
diff --git a/indra/newview/llviewerjointattachment.h b/indra/newview/llviewerjointattachment.h
index 4f72f3dfa9..883df5b2c4 100644
--- a/indra/newview/llviewerjointattachment.h
+++ b/indra/newview/llviewerjointattachment.h
@@ -51,11 +51,11 @@ public:
 
 	// Returns true if this object is transparent.
 	// This is used to determine in which order to draw objects.
-	/*virtual*/ BOOL isTransparent();
+	/*virtual*/ bool isTransparent();
 
 	// Draws the shape attached to a joint.
 	// Called by render().
-	/*virtual*/ U32 drawShape( F32 pixelArea, BOOL first_pass, BOOL is_dummy );
+	/*virtual*/ U32 drawShape( F32 pixelArea, bool first_pass, bool is_dummy );
 	
 	/*virtual*/ bool updateLOD(F32 pixel_area, bool activate);
 
@@ -64,15 +64,15 @@ public:
 	//
 
 	void setPieSlice(S32 pie_slice) { mPieSlice = pie_slice; }	
-	void setVisibleInFirstPerson(BOOL visibility) { mVisibleInFirst = visibility; }
+	void setVisibleInFirstPerson(bool visibility) { mVisibleInFirst = visibility; }
 	BOOL getVisibleInFirstPerson() const { return mVisibleInFirst; }
 	void setGroup(S32 group) { mGroup = group; }
 	void setOriginalPosition(LLVector3 &position);
-	void setAttachmentVisibility(BOOL visible);
-	void setIsHUDAttachment(BOOL is_hud) { mIsHUDAttachment = is_hud; }
-	BOOL getIsHUDAttachment() const { return mIsHUDAttachment; }
+	void setAttachmentVisibility(bool visible);
+	void setIsHUDAttachment(bool is_hud) { mIsHUDAttachment = is_hud; }
+	bool getIsHUDAttachment() const { return mIsHUDAttachment; }
 
-	BOOL isAnimatable() const { return FALSE; }
+	bool isAnimatable() const { return false; }
 
 	S32 getGroup() const { return mGroup; }
 	S32 getPieSlice() const { return mPieSlice; }
@@ -84,13 +84,13 @@ public:
 	//
 	// unique methods
 	//
-	BOOL addObject(LLViewerObject* object);
+	bool addObject(LLViewerObject* object);
 	void removeObject(LLViewerObject *object);
 
 	// 
 	// attachments operations
 	//
-	BOOL isObjectAttached(const LLViewerObject *viewer_object) const;
+	bool isObjectAttached(const LLViewerObject *viewer_object) const;
 	const LLViewerObject *getAttachedObject(const LLUUID &object_id) const;
 	LLViewerObject *getAttachedObject(const LLUUID &object_id);
 
@@ -103,10 +103,10 @@ protected:
 	void setupDrawable(LLViewerObject *object);
 
 private:
-	BOOL			mVisibleInFirst;
+	bool			mVisibleInFirst;
 	LLVector3		mOriginalPos;
 	S32				mGroup;
-	BOOL			mIsHUDAttachment;
+	bool			mIsHUDAttachment;
 	S32				mPieSlice;
 };
 
diff --git a/indra/newview/llviewerjointmesh.cpp b/indra/newview/llviewerjointmesh.cpp
index 7f774e9f63..fd45bc37b2 100644
--- a/indra/newview/llviewerjointmesh.cpp
+++ b/indra/newview/llviewerjointmesh.cpp
@@ -216,7 +216,7 @@ int compare_int(const void *a, const void *b)
 //--------------------------------------------------------------------
 // LLViewerJointMesh::drawShape()
 //--------------------------------------------------------------------
-U32 LLViewerJointMesh::drawShape( F32 pixelArea, BOOL first_pass, BOOL is_dummy)
+U32 LLViewerJointMesh::drawShape( F32 pixelArea, bool first_pass, bool is_dummy)
 {
 	if (!mValid || !mMesh || !mFace || !mVisible || 
 		!mFace->getVertexBuffer() ||
@@ -346,7 +346,7 @@ void LLViewerJointMesh::updateFaceSizes(U32 &num_vertices, U32& num_indices, F32
 // updateFaceData()
 //-----------------------------------------------------------------------------
 
-void LLViewerJointMesh::updateFaceData(LLFace *face, F32 pixel_area, BOOL damp_wind, bool terse_update)
+void LLViewerJointMesh::updateFaceData(LLFace *face, F32 pixel_area, bool damp_wind, bool terse_update)
 {
 	//IF THIS FUNCTION BREAKS, SEE LLPOLYMESH CONSTRUCTOR AND CHECK ALIGNMENT OF INPUT ARRAYS
 
diff --git a/indra/newview/llviewerjointmesh.h b/indra/newview/llviewerjointmesh.h
index 1fe58c60ad..c7f2b1bbac 100644
--- a/indra/newview/llviewerjointmesh.h
+++ b/indra/newview/llviewerjointmesh.h
@@ -54,19 +54,19 @@ public:
 	void uploadJointMatrices();
 
 	// overloaded from base class
-	/*virtual*/ U32 drawShape( F32 pixelArea, BOOL first_pass, BOOL is_dummy );
+	/*virtual*/ U32 drawShape( F32 pixelArea, bool first_pass, bool is_dummy );
 
 	// necessary because MS's compiler warns on function inheritance via dominance in the diamond inheritance here.
 	// warns even though LLViewerJoint holds the only non virtual implementation.
-	/*virtual*/ U32 render( F32 pixelArea, BOOL first_pass = TRUE, BOOL is_dummy = FALSE ) { return LLViewerJoint::render(pixelArea,first_pass,is_dummy);}
+	/*virtual*/ U32 render( F32 pixelArea, bool first_pass = true, bool is_dummy = false ) { return LLViewerJoint::render(pixelArea,first_pass,is_dummy);}
 
 	/*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*/ void updateFaceData(LLFace *face, F32 pixel_area, bool damp_wind = false, bool terse_update = false);
 	/*virtual*/ bool updateLOD(F32 pixel_area, bool activate);
 	/*virtual*/ void updateJointGeometry();
 	/*virtual*/ void dump();
 
-	/*virtual*/ BOOL isAnimatable() const { return FALSE; }
+	/*virtual*/ bool isAnimatable() const { return false; }
 	
 private:
 
diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp
index 8c76f575a9..d0fc0eb16c 100644
--- a/indra/newview/llviewermessage.cpp
+++ b/indra/newview/llviewermessage.cpp
@@ -2276,7 +2276,7 @@ void process_improved_im(LLMessageSystem *msg, void **user_data)
     LL_PROFILE_ZONE_SCOPED;
 
     LLUUID from_id;
-    BOOL from_group;
+    bool from_group;
     LLUUID to_id;
     U8 offline;
     U8 d = 0;
@@ -4305,7 +4305,7 @@ void process_avatar_sit_response(LLMessageSystem *mesgsys, void **user_data)
 	LLVector3 sitPosition;
 	LLQuaternion sitRotation;
 	LLUUID sitObjectID;
-	BOOL use_autopilot;
+	bool use_autopilot;
 	mesgsys->getUUIDFast(_PREHASH_SitObject, _PREHASH_ID, sitObjectID);
 	mesgsys->getBOOLFast(_PREHASH_SitTransform, _PREHASH_AutoPilot, use_autopilot);
 	mesgsys->getVector3Fast(_PREHASH_SitTransform, _PREHASH_SitPosition, sitPosition);
@@ -4314,7 +4314,7 @@ void process_avatar_sit_response(LLMessageSystem *mesgsys, void **user_data)
 	mesgsys->getVector3Fast(_PREHASH_SitTransform, _PREHASH_CameraEyeOffset, camera_eye);
 	LLVector3 camera_at;
 	mesgsys->getVector3Fast(_PREHASH_SitTransform, _PREHASH_CameraAtOffset, camera_at);
-	BOOL force_mouselook;
+	bool force_mouselook;
 	mesgsys->getBOOLFast(_PREHASH_SitTransform, _PREHASH_ForceMouselook, force_mouselook);
 
 	if (isAgentAvatarValid() && dist_vec_squared(camera_eye, camera_at) > CAMERA_POSITION_THRESHOLD_SQUARED)
@@ -4739,12 +4739,12 @@ static void process_money_balance_reply_extended(LLMessageSystem* msg)
     // and agent ids for name lookup.
     S32 transaction_type = 0;
     LLUUID source_id;
-	BOOL is_source_group = FALSE;
+	bool is_source_group = false;
     LLUUID dest_id;
-	BOOL is_dest_group = FALSE;
+	bool is_dest_group = false;
     S32 amount = 0;
     std::string item_description;
-	BOOL success = FALSE;
+	bool success = false;
 
     msg->getS32("TransactionInfo", "TransactionType", transaction_type);
     msg->getUUID("TransactionInfo", "SourceID", source_id);
@@ -5334,7 +5334,7 @@ void process_agent_alert_message(LLMessageSystem* msgsystem, void** user_data)
 
 	if (!attempt_standard_notification(msgsystem))
 	{
-		BOOL modal = FALSE;
+		bool modal = false;
 		msgsystem->getBOOL("AlertData", "Modal", modal);
 		process_alert_core(message, modal);
 	}
@@ -5550,7 +5550,7 @@ void process_frozen_message(LLMessageSystem *msgsystem, void **user_data)
 	// make sure the cursor is back to the usual default since the
 	// alert is probably due to some kind of error.
 	gViewerWindow->getWindow()->resetBusyCount();
-	BOOL b_frozen;
+	bool b_frozen;
 	
 	msgsystem->getBOOL("FrozenData", "Data", b_frozen);
 
@@ -6727,7 +6727,7 @@ void process_load_url(LLMessageSystem* msg, void**)
 {
 	LLUUID object_id;
 	LLUUID owner_id;
-	BOOL owner_is_group;
+	bool owner_is_group;
 	char object_name[256];		/* Flawfinder: ignore */
 	char message[256];		/* Flawfinder: ignore */
 	char url[256];		/* Flawfinder: ignore */
diff --git a/indra/newview/llviewerparcelmgr.cpp b/indra/newview/llviewerparcelmgr.cpp
index 15accd0547..2e59145bbe 100644
--- a/indra/newview/llviewerparcelmgr.cpp
+++ b/indra/newview/llviewerparcelmgr.cpp
@@ -1528,13 +1528,13 @@ void LLViewerParcelMgr::processParcelProperties(LLMessageSystem *msg, void **use
 {
     S32		request_result;
     S32		sequence_id;
-    BOOL	snap_selection = FALSE;
+    bool	snap_selection = false;
     S32		self_count = 0;
     S32		other_count = 0;
     S32		public_count = 0;
     S32		local_id;
     LLUUID	owner_id;
-    BOOL	is_group_owned;
+    bool	is_group_owned;
     U32 auction_id = 0;
     S32		claim_price_per_meter = 0;
     S32		rent_price_per_meter = 0;
@@ -1553,15 +1553,15 @@ void LLViewerParcelMgr::processParcelProperties(LLMessageSystem *msg, void **use
     S32		other_prims = 0;
     S32		selected_prims = 0;
     F32		parcel_prim_bonus = 1.f;
-    BOOL	region_push_override = false;
-    BOOL	region_deny_anonymous_override = false;
-    BOOL	region_deny_identified_override = false; // Deprecated
-    BOOL	region_deny_transacted_override = false; // Deprecated
-    BOOL	region_deny_age_unverified_override = false;
-    BOOL    region_allow_access_override = true;
-    BOOL    region_allow_environment_override = true;
+    bool	region_push_override = false;
+    bool	region_deny_anonymous_override = false;
+    bool	region_deny_identified_override = false; // Deprecated
+    bool	region_deny_transacted_override = false; // Deprecated
+    bool	region_deny_age_unverified_override = false;
+    bool    region_allow_access_override = true;
+    bool    region_allow_environment_override = true;
     S32     parcel_environment_version = 0;
-    BOOL	agent_parcel_update = false; // updating previous(existing) agent parcel
+    bool	agent_parcel_update = false; // updating previous(existing) agent parcel
     U32     extended_flags = 0; //obscure MOAP
 
     S32		other_clean_time = 0;
diff --git a/indra/newview/llviewerregion.cpp b/indra/newview/llviewerregion.cpp
index 452dcdd8fd..d341a966f1 100755
--- a/indra/newview/llviewerregion.cpp
+++ b/indra/newview/llviewerregion.cpp
@@ -2890,7 +2890,7 @@ void LLViewerRegion::unpackRegionHandshake()
 	U8 sim_access;
 	std::string sim_name;
 	LLUUID sim_owner;
-	BOOL is_estate_manager;
+	bool is_estate_manager;
 	F32 water_height;
 	F32 billable_factor;
 	LLUUID cache_id;
diff --git a/indra/newview/llviewertexlayer.cpp b/indra/newview/llviewertexlayer.cpp
index 4c2fbcf837..63c8e0d59c 100644
--- a/indra/newview/llviewertexlayer.cpp
+++ b/indra/newview/llviewertexlayer.cpp
@@ -150,7 +150,7 @@ void LLViewerTexLayerSetBuffer::preRenderTexLayerSet()
 }
 
 // virtual
-void LLViewerTexLayerSetBuffer::postRenderTexLayerSet(BOOL success)
+void LLViewerTexLayerSetBuffer::postRenderTexLayerSet(bool success)
 {
 
 	LLTexLayerSetBuffer::postRenderTexLayerSet(success);
@@ -158,9 +158,9 @@ void LLViewerTexLayerSetBuffer::postRenderTexLayerSet(BOOL success)
 }
 
 // virtual
-void LLViewerTexLayerSetBuffer::midRenderTexLayerSet(BOOL success)
+void LLViewerTexLayerSetBuffer::midRenderTexLayerSet(bool success)
 {
-	const BOOL update_now = mNeedsUpdate && isReadyToUpdate();
+	const bool update_now = mNeedsUpdate && isReadyToUpdate();
 	if (update_now)
 	{
 		doUpdate();
diff --git a/indra/newview/llviewertexlayer.h b/indra/newview/llviewertexlayer.h
index dec7f0ddfc..d1c01bf1ad 100644
--- a/indra/newview/llviewertexlayer.h
+++ b/indra/newview/llviewertexlayer.h
@@ -95,8 +95,8 @@ private:
 	// Tex Layer Render
 	//--------------------------------------------------------------------
 	virtual void			preRenderTexLayerSet();
-	virtual void			midRenderTexLayerSet(BOOL success);
-	virtual void			postRenderTexLayerSet(BOOL success);
+	virtual void			midRenderTexLayerSet(bool success);
+	virtual void			postRenderTexLayerSet(bool success);
 	virtual S32				getCompositeOriginX() const { return getOriginX(); }
 	virtual S32				getCompositeOriginY() const { return getOriginY(); }
 	virtual S32				getCompositeWidth() const { return getFullWidth(); }
diff --git a/indra/newview/llvoavatar.cpp b/indra/newview/llvoavatar.cpp
index bb4ffac604..777fa70539 100644
--- a/indra/newview/llvoavatar.cpp
+++ b/indra/newview/llvoavatar.cpp
@@ -330,12 +330,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 time, U8* joint_mask)
+	virtual bool onUpdate(F32 time, U8* joint_mask)
 	{
         LL_PROFILE_ZONE_SCOPED_CATEGORY_AVATAR;
 		F32 nx[2];
@@ -353,7 +353,7 @@ public:
 		tQn.setQuat( rx, ry, 0.0f );
 		mTorsoState->setRotation( tQn );
 
-		return TRUE;
+		return true;
 	}
 
 	// called when a motion is deactivated
@@ -451,12 +451,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 time, U8* joint_mask)
+	virtual bool onUpdate(F32 time, U8* joint_mask)
 	{
         LL_PROFILE_ZONE_SCOPED_CATEGORY_AVATAR;
 		mBreatheRate = 1.f;
@@ -465,7 +465,7 @@ public:
 
 		mChestState->setRotation(LLQuaternion(breathe_amt, LLVector3(0.f, 1.f, 0.f)));
 
-		return TRUE;
+		return true;
 	}
 
 	// called when a motion is deactivated
@@ -553,17 +553,17 @@ 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 time, U8* joint_mask)
+	virtual bool onUpdate(F32 time, U8* joint_mask)
 	{
         LL_PROFILE_ZONE_SCOPED_CATEGORY_AVATAR;
 		mPelvisState->setPosition(LLVector3::zero);
 
-		return TRUE;
+		return true;
 	}
 
 	// called when a motion is deactivated
@@ -6075,7 +6075,7 @@ LLUUID LLVOAvatar::remapMotionID(const LLUUID& id)
 // id is the asset if of the animation to start
 // time_offset is the offset into the animation at which to start playing
 //-----------------------------------------------------------------------------
-BOOL LLVOAvatar::startMotion(const LLUUID& id, F32 time_offset)
+bool LLVOAvatar::startMotion(const LLUUID& id, F32 time_offset)
 {
 	LL_DEBUGS("Motion") << "motion requested " << id.asString() << " " << gAnimLibrary.animationName(id) << LL_ENDL;
 
@@ -6097,7 +6097,7 @@ BOOL LLVOAvatar::startMotion(const LLUUID& id, F32 time_offset)
 //-----------------------------------------------------------------------------
 // stopMotion()
 //-----------------------------------------------------------------------------
-BOOL LLVOAvatar::stopMotion(const LLUUID& id, BOOL stop_immediate)
+bool LLVOAvatar::stopMotion(const LLUUID& id, bool stop_immediate)
 {
 	LL_DEBUGS("Motion") << "Motion requested " << id.asString() << " " << gAnimLibrary.animationName(id) << LL_ENDL;
 
diff --git a/indra/newview/llvoavatar.h b/indra/newview/llvoavatar.h
index 72770e19a8..203e3e8c62 100644
--- a/indra/newview/llvoavatar.h
+++ b/indra/newview/llvoavatar.h
@@ -192,8 +192,8 @@ public:
 	/*virtual*/ LLVector3    	getCharacterAngularVelocity();
 
 	/*virtual*/ LLUUID			remapMotionID(const LLUUID& id);
-	/*virtual*/ BOOL			startMotion(const LLUUID& id, F32 time_offset = 0.f);
-	/*virtual*/ BOOL			stopMotion(const LLUUID& id, BOOL stop_immediate = FALSE);
+	/*virtual*/ bool			startMotion(const LLUUID& id, F32 time_offset = 0.f);
+	/*virtual*/ bool			stopMotion(const LLUUID& id, bool stop_immediate = FALSE);
 	virtual bool			hasMotionFromSource(const LLUUID& source_id);
 	virtual void			stopMotionFromSource(const LLUUID& source_id);
 	virtual void			requestStopMotion(LLMotion* motion);
diff --git a/indra/newview/llvoavatarself.cpp b/indra/newview/llvoavatarself.cpp
index 528407b82c..4f41a63e64 100644
--- a/indra/newview/llvoavatarself.cpp
+++ b/indra/newview/llvoavatarself.cpp
@@ -727,29 +727,29 @@ LLJoint *LLVOAvatarSelf::getJoint(const std::string &name)
 }
 
 // virtual
-BOOL LLVOAvatarSelf::setVisualParamWeight(const LLVisualParam *which_param, F32 weight)
+bool LLVOAvatarSelf::setVisualParamWeight(const LLVisualParam *which_param, F32 weight)
 {
 	if (!which_param)
 	{
-		return FALSE;
+		return false;
 	}
 	LLViewerVisualParam *param = (LLViewerVisualParam*) LLCharacter::getVisualParam(which_param->getID());
 	return setParamWeight(param,weight);
 }
 
 // virtual
-BOOL LLVOAvatarSelf::setVisualParamWeight(const char* param_name, F32 weight)
+bool LLVOAvatarSelf::setVisualParamWeight(const char* param_name, F32 weight)
 {
 	if (!param_name)
 	{
-		return FALSE;
+		return false;
 	}
 	LLViewerVisualParam *param = (LLViewerVisualParam*) LLCharacter::getVisualParam(param_name);
 	return setParamWeight(param,weight);
 }
 
 // virtual
-BOOL LLVOAvatarSelf::setVisualParamWeight(S32 index, F32 weight)
+bool LLVOAvatarSelf::setVisualParamWeight(S32 index, F32 weight)
 {
 	LLViewerVisualParam *param = (LLViewerVisualParam*) LLCharacter::getVisualParam(index);
 	return setParamWeight(param,weight);
diff --git a/indra/newview/llvoavatarself.h b/indra/newview/llvoavatarself.h
index a121ef356e..c4a81affe6 100644
--- a/indra/newview/llvoavatarself.h
+++ b/indra/newview/llvoavatarself.h
@@ -92,9 +92,9 @@ public:
 	/*virtual*/ void 		requestStopMotion(LLMotion* motion);
 	/*virtual*/ LLJoint*	getJoint(const std::string &name);
 	
-	/*virtual*/ BOOL setVisualParamWeight(const LLVisualParam *which_param, F32 weight);
-	/*virtual*/ BOOL setVisualParamWeight(const char* param_name, F32 weight);
-	/*virtual*/ BOOL setVisualParamWeight(S32 index, F32 weight);
+	/*virtual*/ bool setVisualParamWeight(const LLVisualParam *which_param, F32 weight);
+	/*virtual*/ bool setVisualParamWeight(const char* param_name, F32 weight);
+	/*virtual*/ bool setVisualParamWeight(S32 index, F32 weight);
 	/*virtual*/ void updateVisualParams();
 	void writeWearablesToAvatar();
 	/*virtual*/ void idleUpdateAppearanceAnimation();