Convert remaining BOOL to bool

1 files changed, 84 insertions, 84 deletions

diff --git a/indra/newview/llvoavatarself.cpp b/indra/newview/llvoavatarself.cpp
index 4f41a63e64..b1ca5f7a4b 100644
--- a/indra/newview/llvoavatarself.cpp
+++ b/indra/newview/llvoavatarself.cpp
@@ -78,7 +78,7 @@
 
 LLPointer<LLVOAvatarSelf> gAgentAvatarp = NULL;
 
-BOOL isAgentAvatarValid()
+bool isAgentAvatarValid()
 {
 	return (gAgentAvatarp.notNull() && gAgentAvatarp->isValid());
 }
@@ -172,7 +172,7 @@ LLVOAvatarSelf::LLVOAvatarSelf(const LLUUID& id,
     mInitialMetric(true),
     mMetricSequence(0)
 {
-	mMotionController.mIsSelf = TRUE;
+	mMotionController.mIsSelf = true;
 
 	LL_DEBUGS() << "Marking avatar as self " << id << LL_ENDL;
 }
@@ -200,7 +200,7 @@ bool update_avatar_rez_metrics()
 
 void LLVOAvatarSelf::initInstance()
 {
-	BOOL status = TRUE;
+	bool status = true;
 	// creates hud joint(mScreen) among other things
 	status &= loadAvatarSelf();
 
@@ -305,7 +305,7 @@ void LLVOAvatarSelf::markDead()
 	bool success = LLVOAvatar::loadAvatar();
 
 	// set all parameters stored directly in the avatar to have
-	// the isSelfParam to be TRUE - this is used to prevent
+	// the isSelfParam to be true - this is used to prevent
 	// them from being animated or trigger accidental rebakes
 	// when we copy params from the wearable to the base avatar.
 	for (LLViewerVisualParam* param = (LLViewerVisualParam*) getFirstVisualParam(); 
@@ -322,20 +322,20 @@ void LLVOAvatarSelf::markDead()
 }
 
 
-BOOL LLVOAvatarSelf::loadAvatarSelf()
+bool LLVOAvatarSelf::loadAvatarSelf()
 {
-	BOOL success = TRUE;
+	bool success = true;
 	// avatar_skeleton.xml
 	if (!buildSkeletonSelf(sAvatarSkeletonInfo))
 	{
 		LL_WARNS() << "avatar file: buildSkeleton() failed" << LL_ENDL;
-		return FALSE;
+		return false;
 	}
 
 	return success;
 }
 
-BOOL LLVOAvatarSelf::buildSkeletonSelf(const LLAvatarSkeletonInfo *info)
+bool LLVOAvatarSelf::buildSkeletonSelf(const LLAvatarSkeletonInfo *info)
 {
 	// add special-purpose "screen" joint
 	mScreenp = new LLViewerJoint("mScreen", NULL);
@@ -347,11 +347,11 @@ BOOL LLVOAvatarSelf::buildSkeletonSelf(const LLAvatarSkeletonInfo *info)
 	// SL-315
 	mScreenp->setWorldPosition(LLVector3::zero);
 	// need to update screen agressively when sidebar opens/closes, for example
-	mScreenp->mUpdateXform = TRUE;
-	return TRUE;
+	mScreenp->mUpdateXform = true;
+	return true;
 }
 
-BOOL LLVOAvatarSelf::buildMenus()
+bool LLVOAvatarSelf::buildMenus()
 {
 	//-------------------------------------------------------------------------
 	// build the attach and detach menus
@@ -652,7 +652,7 @@ BOOL LLVOAvatarSelf::buildMenus()
 			}
 		}
 	}
-	return TRUE;
+	return true;
 }
 
 void LLVOAvatarSelf::cleanup()
@@ -755,11 +755,11 @@ bool LLVOAvatarSelf::setVisualParamWeight(S32 index, F32 weight)
 	return setParamWeight(param,weight);
 }
 
-BOOL LLVOAvatarSelf::setParamWeight(const LLViewerVisualParam *param, F32 weight)
+bool LLVOAvatarSelf::setParamWeight(const LLViewerVisualParam *param, F32 weight)
 {
 	if (!param)
 	{
-		return FALSE;
+		return false;
 	}
 
 	if (param->getCrossWearable())
@@ -841,7 +841,7 @@ void LLVOAvatarSelf::stopMotionFromSource(const LLUUID& source_id)
 	LLViewerObject* object = gObjectList.findObject(source_id);
 	if (object)
 	{
-		object->setFlagsWithoutUpdate(FLAGS_ANIM_SOURCE, FALSE);
+		object->setFlagsWithoutUpdate(FLAGS_ANIM_SOURCE, false);
 	}
 }
 
@@ -870,7 +870,7 @@ void LLVOAvatarSelf::setLocalTextureTE(U8 te, LLViewerTexture* image, U32 index)
 //virtual
 void LLVOAvatarSelf::removeMissingBakedTextures()
 {	
-	BOOL removed = FALSE;
+	bool removed = false;
 	for (U32 i = 0; i < mBakedTextureDatas.size(); i++)
 	{
 		const S32 te = mBakedTextureDatas[i].mTextureIndex;
@@ -885,7 +885,7 @@ void LLVOAvatarSelf::removeMissingBakedTextures()
 			if (imagep && imagep != tex)
 			{
 				setTEImage(te, imagep);
-				removed = TRUE;
+				removed = true;
 			}
 		}
 	}
@@ -895,7 +895,7 @@ void LLVOAvatarSelf::removeMissingBakedTextures()
 		for (U32 i = 0; i < mBakedTextureDatas.size(); i++)
 		{
 			LLViewerTexLayerSet *layerset = getTexLayerSet(i);
-			layerset->setUpdatesEnabled(TRUE);
+			layerset->setUpdatesEnabled(true);
 			invalidateComposite(layerset);
 		}
 		updateMeshTextures();
@@ -1020,7 +1020,7 @@ void LLVOAvatarSelf::idleUpdateTractorBeam()
 		if (mBeamTimer.getElapsedTimeF32() > 0.25f)
 		{
 			mBeam->setColor(LLColor4U(gAgent.getEffectColor()));
-			mBeam->setNeedsSendToSim(TRUE);
+			mBeam->setNeedsSendToSim(true);
 			mBeamTimer.reset();
 		}
 	}
@@ -1033,7 +1033,7 @@ void LLVOAvatarSelf::idleUpdateTractorBeam()
 void LLVOAvatarSelf::restoreMeshData()
 {
 	//LL_INFOS() << "Restoring" << LL_ENDL;
-	mMeshValid = TRUE;
+	mMeshValid = true;
 	updateJointLODs();
 	updateAttachmentVisibility(gAgentCamera.getCameraMode());
 
@@ -1055,7 +1055,7 @@ void LLVOAvatarSelf::updateAttachmentVisibility(U32 camera_mode)
 		LLViewerJointAttachment* attachment = iter->second;
 		if (attachment->getIsHUDAttachment())
 		{
-			attachment->setAttachmentVisibility(TRUE);
+			attachment->setAttachmentVisibility(true);
 		}
 		else
 		{
@@ -1064,15 +1064,15 @@ void LLVOAvatarSelf::updateAttachmentVisibility(U32 camera_mode)
 				case CAMERA_MODE_MOUSELOOK:
 					if (LLVOAvatar::sVisibleInFirstPerson && attachment->getVisibleInFirstPerson())
 					{
-						attachment->setAttachmentVisibility(TRUE);
+						attachment->setAttachmentVisibility(true);
 					}
 					else
 					{
-						attachment->setAttachmentVisibility(FALSE);
+						attachment->setAttachmentVisibility(false);
 					}
 					break;
 				default:
-					attachment->setAttachmentVisibility(TRUE);
+					attachment->setAttachmentVisibility(true);
 					break;
 			}
 		}
@@ -1082,7 +1082,7 @@ void LLVOAvatarSelf::updateAttachmentVisibility(U32 camera_mode)
 //-----------------------------------------------------------------------------
 // updatedWearable( LLWearableType::EType type )
 // forces an update to any baked textures relevant to type.
-// will force an upload of the resulting bake if the second parameter is TRUE
+// will force an upload of the resulting bake if the second parameter is true
 //-----------------------------------------------------------------------------
 void LLVOAvatarSelf::wearableUpdated(LLWearableType::EType type)
 {
@@ -1118,7 +1118,7 @@ void LLVOAvatarSelf::wearableUpdated(LLWearableType::EType type)
 //-----------------------------------------------------------------------------
 // isWearingAttachment()
 //-----------------------------------------------------------------------------
-BOOL LLVOAvatarSelf::isWearingAttachment(const LLUUID& inv_item_id) const
+bool LLVOAvatarSelf::isWearingAttachment(const LLUUID& inv_item_id) const
 {
 	const LLUUID& base_inv_item_id = gInventory.getLinkedItemID(inv_item_id);
 	for (attachment_map_t::const_iterator iter = mAttachmentPoints.begin(); 
@@ -1128,10 +1128,10 @@ BOOL LLVOAvatarSelf::isWearingAttachment(const LLUUID& inv_item_id) const
 		const LLViewerJointAttachment* attachment = iter->second;
 		if (attachment->getAttachedObject(base_inv_item_id))
 		{
-			return TRUE;
+			return true;
 		}
 	}
-	return FALSE;
+	return false;
 }
 
 //-----------------------------------------------------------------------------
@@ -1208,7 +1208,7 @@ const LLViewerJointAttachment *LLVOAvatarSelf::attachObject(LLViewerObject *view
 }
 
 //virtual
-BOOL LLVOAvatarSelf::detachObject(LLViewerObject *viewer_object)
+bool LLVOAvatarSelf::detachObject(LLViewerObject *viewer_object)
 {
 	const LLUUID attachment_id = viewer_object->getAttachmentItemID();
 	if ( LLVOAvatar::detachObject(viewer_object) )
@@ -1216,7 +1216,7 @@ BOOL LLVOAvatarSelf::detachObject(LLViewerObject *viewer_object)
 		// the simulator should automatically handle permission revocation
 		
 		stopMotionFromSource(attachment_id);
-		LLFollowCamMgr::getInstance()->setCameraActive(viewer_object->getID(), FALSE);
+		LLFollowCamMgr::getInstance()->setCameraActive(viewer_object->getID(), false);
 		
 		LLViewerObject::const_child_list_t& child_list = viewer_object->getChildren();
 		for (LLViewerObject::child_list_t::const_iterator iter = child_list.begin();
@@ -1228,7 +1228,7 @@ BOOL LLVOAvatarSelf::detachObject(LLViewerObject *viewer_object)
 			// permissions revocation
 			
 			stopMotionFromSource(child_objectp->getID());
-			LLFollowCamMgr::getInstance()->setCameraActive(child_objectp->getID(), FALSE);
+			LLFollowCamMgr::getInstance()->setCameraActive(child_objectp->getID(), false);
 		}
 		
 		// Make sure the inventory is in sync with the avatar.
@@ -1243,9 +1243,9 @@ BOOL LLVOAvatarSelf::detachObject(LLViewerObject *viewer_object)
 			LLAppearanceMgr::instance().unregisterAttachment(attachment_id);
 		}
 		
-		return TRUE;
+		return true;
 	}
-	return FALSE;
+	return false;
 }
 
 bool LLVOAvatarSelf::hasAttachmentsInTrash()
@@ -1270,7 +1270,7 @@ bool LLVOAvatarSelf::hasAttachmentsInTrash()
 }
 
 // static
-BOOL LLVOAvatarSelf::detachAttachmentIntoInventory(const LLUUID &item_id)
+bool LLVOAvatarSelf::detachAttachmentIntoInventory(const LLUUID &item_id)
 {
 	LLInventoryItem* item = gInventory.getItem(item_id);
 	if (item)
@@ -1299,9 +1299,9 @@ BOOL LLVOAvatarSelf::detachAttachmentIntoInventory(const LLUUID &item_id)
 				LLAppearanceMgr::instance().removeCOFItemLinks(item_id);
 			}
 		}
-		return TRUE;
+		return true;
 	}
-	return FALSE;
+	return false;
 }
 
 U32 LLVOAvatarSelf::getNumWearables(LLAvatarAppearanceDefines::ETextureIndex i) const
@@ -1311,7 +1311,7 @@ U32 LLVOAvatarSelf::getNumWearables(LLAvatarAppearanceDefines::ETextureIndex i)
 }
 
 // virtual
-void LLVOAvatarSelf::localTextureLoaded(BOOL success, LLViewerFetchedTexture *src_vi, LLImageRaw* src_raw, LLImageRaw* aux_src, S32 discard_level, BOOL final, void* userdata)
+void LLVOAvatarSelf::localTextureLoaded(bool success, LLViewerFetchedTexture *src_vi, LLImageRaw* src_raw, LLImageRaw* aux_src, S32 discard_level, bool final, void* userdata)
 {	
 
 	const LLUUID& src_id = src_vi->getID();
@@ -1360,20 +1360,20 @@ void LLVOAvatarSelf::localTextureLoaded(BOOL success, LLViewerFetchedTexture *sr
 }
 
 // virtual
-BOOL LLVOAvatarSelf::getLocalTextureGL(ETextureIndex type, LLViewerTexture** tex_pp, U32 index) const
+bool LLVOAvatarSelf::getLocalTextureGL(ETextureIndex type, LLViewerTexture** tex_pp, U32 index) const
 {
 	*tex_pp = NULL;
 
-	if (!isIndexLocalTexture(type)) return FALSE;
-	if (getLocalTextureID(type, index) == IMG_DEFAULT_AVATAR) return TRUE;
+	if (!isIndexLocalTexture(type)) return false;
+	if (getLocalTextureID(type, index) == IMG_DEFAULT_AVATAR) return true;
 
 	const LLLocalTextureObject *local_tex_obj = getLocalTextureObject(type, index);
 	if (!local_tex_obj)
 	{
-		return FALSE;
+		return false;
 	}
 	*tex_pp = dynamic_cast<LLViewerTexture*> (local_tex_obj->getImage());
-	return TRUE;
+	return true;
 }
 
 LLViewerFetchedTexture* LLVOAvatarSelf::getLocalTextureGL(LLAvatarAppearanceDefines::ETextureIndex type, U32 index) const
@@ -1413,7 +1413,7 @@ const LLUUID& LLVOAvatarSelf::getLocalTextureID(ETextureIndex type, U32 index) c
 // Returns true if at least the lowest quality discard level exists for every texture
 // in the layerset.
 //-----------------------------------------------------------------------------
-BOOL LLVOAvatarSelf::isLocalTextureDataAvailable(const LLViewerTexLayerSet* layerset) const
+bool LLVOAvatarSelf::isLocalTextureDataAvailable(const LLViewerTexLayerSet* layerset) const
 {
 	/* if (layerset == mBakedTextureDatas[BAKED_HEAD].mTexLayerSet)
 	   return getLocalDiscardLevel(TEX_HEAD_BODYPAINT) >= 0; */
@@ -1424,7 +1424,7 @@ BOOL LLVOAvatarSelf::isLocalTextureDataAvailable(const LLViewerTexLayerSet* laye
 		const EBakedTextureIndex baked_index = baked_iter->first;
 		if (layerset == mBakedTextureDatas[baked_index].mTexLayerSet)
 		{
-			BOOL ret = true;
+			bool ret = true;
 			const LLAvatarAppearanceDictionary::BakedEntry *baked_dict = baked_iter->second;
 			for (texture_vec_t::const_iterator local_tex_iter = baked_dict->mLocalTextures.begin();
 				 local_tex_iter != baked_dict->mLocalTextures.end();
@@ -1435,7 +1435,7 @@ BOOL LLVOAvatarSelf::isLocalTextureDataAvailable(const LLViewerTexLayerSet* laye
 				const U32 wearable_count = gAgentWearables.getWearableCount(wearable_type);
 				for (U32 wearable_index = 0; wearable_index < wearable_count; wearable_index++)
 				{
-					BOOL tex_avail = (getLocalDiscardLevel(tex_index, wearable_index) >= 0);
+					bool tex_avail = (getLocalDiscardLevel(tex_index, wearable_index) >= 0);
 					ret &= tex_avail;
 				}
 			}
@@ -1443,7 +1443,7 @@ BOOL LLVOAvatarSelf::isLocalTextureDataAvailable(const LLViewerTexLayerSet* laye
 		}
 	}
 	llassert(0);
-	return FALSE;
+	return false;
 }
 
 //-----------------------------------------------------------------------------
@@ -1452,7 +1452,7 @@ BOOL LLVOAvatarSelf::isLocalTextureDataAvailable(const LLViewerTexLayerSet* laye
 // Returns true if the highest quality discard level exists for every texture
 // in the layerset.
 //-----------------------------------------------------------------------------
-BOOL LLVOAvatarSelf::isLocalTextureDataFinal(const LLViewerTexLayerSet* layerset) const
+bool LLVOAvatarSelf::isLocalTextureDataFinal(const LLViewerTexLayerSet* layerset) const
 {
 	const U32 desired_tex_discard_level = gSavedSettings.getU32("TextureDiscardLevel"); 
 	// const U32 desired_tex_discard_level = 0; // hack to not bake textures on lower discard levels.
@@ -1475,19 +1475,19 @@ BOOL LLVOAvatarSelf::isLocalTextureDataFinal(const LLViewerTexLayerSet* layerset
 					if ((local_discard_level > (S32)(desired_tex_discard_level)) ||
 						(local_discard_level < 0 ))
 					{
-						return FALSE;
+						return false;
 					}
 				}
 			}
-			return TRUE;
+			return true;
 		}
 	}
 	llassert(0);
-	return FALSE;
+	return false;
 }
 
 
-BOOL LLVOAvatarSelf::isAllLocalTextureDataFinal() const
+bool LLVOAvatarSelf::isAllLocalTextureDataFinal() const
 {
 	const U32 desired_tex_discard_level = gSavedSettings.getU32("TextureDiscardLevel"); 
 	// const U32 desired_tex_discard_level = 0; // hack to not bake textures on lower discard levels
@@ -1508,18 +1508,18 @@ BOOL LLVOAvatarSelf::isAllLocalTextureDataFinal() const
 				if ((local_discard_level > (S32)(desired_tex_discard_level)) ||
 					(local_discard_level < 0 ))
 				{
-					return FALSE;
+					return false;
 				}
 			}
 		}
 	}
-	return TRUE;
+	return true;
 }
 
 bool LLVOAvatarSelf::isTextureDefined(LLAvatarAppearanceDefines::ETextureIndex type, U32 index) const
 {
 	LLUUID id;
-	BOOL isDefined = TRUE;
+	bool isDefined = true;
 	if (isIndexLocalTexture(type))
 	{
 		const LLWearableType::EType wearable_type = sAvatarDictionary->getTEWearableType(type);
@@ -1549,7 +1549,7 @@ bool LLVOAvatarSelf::isTextureDefined(LLAvatarAppearanceDefines::ETextureIndex t
 }
 
 //virtual
-BOOL LLVOAvatarSelf::isTextureVisible(LLAvatarAppearanceDefines::ETextureIndex type, U32 index) const
+bool LLVOAvatarSelf::isTextureVisible(LLAvatarAppearanceDefines::ETextureIndex type, U32 index) const
 {
 	if (isIndexBakedTexture(type))
 	{
@@ -1562,7 +1562,7 @@ BOOL LLVOAvatarSelf::isTextureVisible(LLAvatarAppearanceDefines::ETextureIndex t
 }
 
 //virtual
-BOOL LLVOAvatarSelf::isTextureVisible(LLAvatarAppearanceDefines::ETextureIndex type, LLViewerWearable *wearable) const
+bool LLVOAvatarSelf::isTextureVisible(LLAvatarAppearanceDefines::ETextureIndex type, LLViewerWearable *wearable) const
 {
 	if (isIndexBakedTexture(type))
 	{
@@ -1577,7 +1577,7 @@ BOOL LLVOAvatarSelf::isTextureVisible(LLAvatarAppearanceDefines::ETextureIndex t
 	else
 	{
 		LL_WARNS() << "Wearable not found" << LL_ENDL;
-		return FALSE;
+		return false;
 	}
 }
 
@@ -1644,7 +1644,7 @@ void LLVOAvatarSelf::setupComposites()
 	for (U32 i = 0; i < mBakedTextureDatas.size(); i++)
 	{
 		ETextureIndex tex_index = mBakedTextureDatas[i].mTextureIndex;
-		BOOL layer_baked = isTextureDefined(tex_index, gAgentWearables.getWearableCount(tex_index));
+		bool layer_baked = isTextureDefined(tex_index, gAgentWearables.getWearableCount(tex_index));
 		LLViewerTexLayerSet *layerset = getTexLayerSet(i);
 		if (layerset)
 		{
@@ -1669,7 +1669,7 @@ void LLVOAvatarSelf::updateComposites()
 // virtual
 S32 LLVOAvatarSelf::getLocalDiscardLevel(ETextureIndex type, U32 wearable_index) const
 {
-	if (!isIndexLocalTexture(type)) return FALSE;
+	if (!isIndexLocalTexture(type)) return false;
 
 	const LLLocalTextureObject *local_tex_obj = getLocalTextureObject(type, wearable_index);
 	if (local_tex_obj)
@@ -1720,11 +1720,11 @@ void LLVOAvatarSelf::getLocalTextureByteCount(S32* gl_bytes) const
 }
 
 // virtual 
-void LLVOAvatarSelf::setLocalTexture(ETextureIndex type, LLViewerTexture* src_tex, BOOL baked_version_ready, U32 index)
+void LLVOAvatarSelf::setLocalTexture(ETextureIndex type, LLViewerTexture* src_tex, bool baked_version_ready, U32 index)
 {
 	if (!isIndexLocalTexture(type)) return;
 
-	LLViewerFetchedTexture* tex = LLViewerTextureManager::staticCastToFetchedTexture(src_tex, TRUE) ;
+	LLViewerFetchedTexture* tex = LLViewerTextureManager::staticCastToFetchedTexture(src_tex, true) ;
 	if(!tex)
 	{
 		return ;
@@ -1785,7 +1785,7 @@ void LLVOAvatarSelf::setLocalTexture(ETextureIndex type, LLViewerTexture* src_te
 				}
 				else
 				{					
-					tex->setLoadedCallback(onLocalTextureLoaded, desired_discard, TRUE, FALSE, new LLAvatarTexData(getID(), type), NULL);
+					tex->setLoadedCallback(onLocalTextureLoaded, desired_discard, true, false, new LLAvatarTexData(getID(), type), NULL);
 				}
 			}
 			tex->setMinDiscardLevel(desired_discard);
@@ -1797,7 +1797,7 @@ void LLVOAvatarSelf::setLocalTexture(ETextureIndex type, LLViewerTexture* src_te
 }
 
 //virtual
-void LLVOAvatarSelf::setBakedReady(LLAvatarAppearanceDefines::ETextureIndex type, BOOL baked_version_exists, U32 index)
+void LLVOAvatarSelf::setBakedReady(LLAvatarAppearanceDefines::ETextureIndex type, bool baked_version_exists, U32 index)
 {
 	if (!isIndexLocalTexture(type)) return;
 	LLLocalTextureObject *local_tex_obj = getLocalTextureObject(type,index);
@@ -1874,7 +1874,7 @@ void LLVOAvatarSelf::dumpLocalTextures() const
 // onLocalTextureLoaded()
 //-----------------------------------------------------------------------------
 
-void LLVOAvatarSelf::onLocalTextureLoaded(BOOL success, LLViewerFetchedTexture *src_vi, LLImageRaw* src_raw, LLImageRaw* aux_src, S32 discard_level, BOOL final, void* userdata)
+void LLVOAvatarSelf::onLocalTextureLoaded(bool success, LLViewerFetchedTexture *src_vi, LLImageRaw* src_raw, LLImageRaw* aux_src, S32 discard_level, bool final, void* userdata)
 {
 	LLAvatarTexData *data = (LLAvatarTexData *)userdata;
 	LLVOAvatarSelf *self = (LLVOAvatarSelf *)gObjectList.findObject(data->mAvatarID);
@@ -1894,7 +1894,7 @@ void LLVOAvatarSelf::onLocalTextureLoaded(BOOL success, LLViewerFetchedTexture *
 {
 	if (isIndexLocalTexture((ETextureIndex)te))
 	{
-		setLocalTexture((ETextureIndex)te, imagep, FALSE ,index);
+		setLocalTexture((ETextureIndex)te, imagep, false ,index);
 	}
 	else 
 	{
@@ -2013,7 +2013,7 @@ bool LLVOAvatarSelf::getIsCloud() const
 }
 
 /*static*/
-void LLVOAvatarSelf::debugOnTimingLocalTexLoaded(BOOL success, LLViewerFetchedTexture *src_vi, LLImageRaw* src, LLImageRaw* aux_src, S32 discard_level, BOOL final, void* userdata)
+void LLVOAvatarSelf::debugOnTimingLocalTexLoaded(bool success, LLViewerFetchedTexture *src_vi, LLImageRaw* src, LLImageRaw* aux_src, S32 discard_level, bool final, void* userdata)
 {
 	if (gAgentAvatarp.notNull())
 	{
@@ -2021,7 +2021,7 @@ void LLVOAvatarSelf::debugOnTimingLocalTexLoaded(BOOL success, LLViewerFetchedTe
 	}
 }
 
-void LLVOAvatarSelf::debugTimingLocalTexLoaded(BOOL success, LLViewerFetchedTexture *src_vi, LLImageRaw* src, LLImageRaw* aux_src, S32 discard_level, BOOL final, void* userdata)
+void LLVOAvatarSelf::debugTimingLocalTexLoaded(bool success, LLViewerFetchedTexture *src_vi, LLImageRaw* src, LLImageRaw* aux_src, S32 discard_level, bool final, void* userdata)
 {
 	LLAvatarTexData *data = (LLAvatarTexData *)userdata;
 	if (!data)
@@ -2046,7 +2046,7 @@ void LLVOAvatarSelf::debugTimingLocalTexLoaded(BOOL success, LLViewerFetchedText
 	}
 }
 
-void LLVOAvatarSelf::debugBakedTextureUpload(EBakedTextureIndex index, BOOL finished)
+void LLVOAvatarSelf::debugBakedTextureUpload(EBakedTextureIndex index, bool finished)
 {
 	U32 done = 0;
 	if (finished)
@@ -2185,7 +2185,7 @@ const std::string LLVOAvatarSelf::debugDumpAllLocalTextureDataInfo() const
 	for (U32 i = 0; i < mBakedTextureDatas.size(); i++)
 	{
 		const LLAvatarAppearanceDictionary::BakedEntry *baked_dict = sAvatarDictionary->getBakedTexture((EBakedTextureIndex)i);
-		BOOL is_texture_final = TRUE;
+		bool is_texture_final = true;
 		for (texture_vec_t::const_iterator local_tex_iter = baked_dict->mLocalTextures.begin();
 			 local_tex_iter != baked_dict->mLocalTextures.end();
 			 ++local_tex_iter)
@@ -2381,22 +2381,22 @@ const LLUUID& LLVOAvatarSelf::grabBakedTexture(EBakedTextureIndex baked_index) c
 	return LLUUID::null;
 }
 
-BOOL LLVOAvatarSelf::canGrabBakedTexture(EBakedTextureIndex baked_index) const
+bool LLVOAvatarSelf::canGrabBakedTexture(EBakedTextureIndex baked_index) const
 {
 	ETextureIndex tex_index = sAvatarDictionary->bakedToLocalTextureIndex(baked_index);
 	if (tex_index == TEX_NUM_INDICES)
 	{
-		return FALSE;
+		return false;
 	}
 	// Check if the texture hasn't been baked yet.
 	if (!isTextureDefined(tex_index, 0))
 	{
 		LL_DEBUGS() << "getTEImage( " << (U32) tex_index << " )->getID() == IMG_DEFAULT_AVATAR" << LL_ENDL;
-		return FALSE;
+		return false;
 	}
 
 	if (gAgent.isGodlikeWithoutAdminMenuFakery())
-		return TRUE;
+		return true;
 
 	// Check permissions of textures that show up in the
 	// baked texture.  We don't want people copying people's
@@ -2431,7 +2431,7 @@ BOOL LLVOAvatarSelf::canGrabBakedTexture(EBakedTextureIndex baked_index) const
 													LLInventoryModel::INCLUDE_TRASH,
 													asset_id_matches);
 
-					BOOL can_grab = FALSE;
+					bool can_grab = false;
 					LL_DEBUGS() << "item count for asset " << texture_id << ": " << items.size() << LL_ENDL;
 					if (items.size())
 					{
@@ -2441,22 +2441,22 @@ BOOL LLVOAvatarSelf::canGrabBakedTexture(EBakedTextureIndex baked_index) const
 							LLViewerInventoryItem* itemp = items[i];
 												if (itemp->getIsFullPerm())
 							{
-								can_grab = TRUE;
+								can_grab = true;
 								break;
 							}
 						}
 					}
-					if (!can_grab) return FALSE;
+					if (!can_grab) return false;
 				}
 			}
 		}
 	}
 
-	return TRUE;
+	return true;
 }
 
 void LLVOAvatarSelf::addLocalTextureStats( ETextureIndex type, LLViewerFetchedTexture* imagep,
-										   F32 texel_area_ratio, BOOL render_avatar, BOOL covered_by_baked)
+										   F32 texel_area_ratio, bool render_avatar, bool covered_by_baked)
 {
 	if (!isIndexLocalTexture(type)) return;
 
@@ -2481,14 +2481,14 @@ void LLVOAvatarSelf::addLocalTextureStats( ETextureIndex type, LLViewerFetchedTe
 				imagep->forceUpdateBindStats() ;
 				if (imagep->getDiscardLevel() < 0)
 				{
-					mHasGrey = TRUE; // for statistics gathering
+					mHasGrey = true; // for statistics gathering
 				}
 			}
 		}
 		else
 		{
 			// texture asset is missing
-			mHasGrey = TRUE; // for statistics gathering
+			mHasGrey = true; // for statistics gathering
 		}
 	}
 }
@@ -2610,7 +2610,7 @@ void LLVOAvatarSelf::forceBakeAllTextures(bool slam_for_debug)
 		{
 			if (slam_for_debug)
 			{
-				layer_set->setUpdatesEnabled(TRUE);
+				layer_set->setUpdatesEnabled(true);
 			}
 
 			invalidateComposite(layer_set);
@@ -2815,18 +2815,18 @@ void LLVOAvatarSelf::setHoverOffset(const LLVector3& hover_offset, bool send_upd
 //------------------------------------------------------------------------
 // needsRenderBeam()
 //------------------------------------------------------------------------
-BOOL LLVOAvatarSelf::needsRenderBeam()
+bool LLVOAvatarSelf::needsRenderBeam()
 {
 	LLTool *tool = LLToolMgr::getInstance()->getCurrentTool();
 
-	BOOL is_touching_or_grabbing = (tool == LLToolGrab::getInstance() && LLToolGrab::getInstance()->isEditing());
+	bool is_touching_or_grabbing = (tool == LLToolGrab::getInstance() && LLToolGrab::getInstance()->isEditing());
     LLViewerObject* objp = LLToolGrab::getInstance()->getEditingObject();
     if (objp // might need to be "!objp ||" instead of "objp &&".
         && (objp->isAttachment() || objp->isAvatar()))
     {
         // don't render grab tool's selection beam on hud objects,
         // attachments or avatars
-        is_touching_or_grabbing = FALSE;
+        is_touching_or_grabbing = false;
     }
 	return is_touching_or_grabbing || (getAttachmentState() & AGENT_STATE_EDITING && LLSelectMgr::getInstance()->shouldShowSelection());
 }