misc: BOOL to bool

4 files changed, 120 insertions, 120 deletions

diff --git a/indra/llmath/llvolume.cpp b/indra/llmath/llvolume.cpp
index 5f0c668b33..73569cfa07 100644
--- a/indra/llmath/llvolume.cpp
+++ b/indra/llmath/llvolume.cpp
@@ -95,7 +95,7 @@ const F32 SKEW_MAX	=  0.95f;
 const F32 SCULPT_MIN_AREA = 0.002f;
 const S32 SCULPT_MIN_AREA_DETAIL = 1;
 
-BOOL gDebugGL = FALSE; // See settings.xml "RenderDebugGL"
+bool gDebugGL = FALSE; // See settings.xml "RenderDebugGL"
 
 bool check_same_clock_dir( const LLVector3& pt1, const LLVector3& pt2, const LLVector3& pt3, const LLVector3& norm)
 {
@@ -1081,7 +1081,7 @@ bool LLProfile::generate(const LLProfileParams& params, bool path_open,F32 detai
 
 
 
-BOOL LLProfileParams::importFile(LLFILE *fp)
+bool LLProfileParams::importFile(LLFILE *fp)
 {
 	const S32 BUFSIZE = 16384;
 	char buffer[BUFSIZE];	/* Flawfinder: ignore */
@@ -1139,11 +1139,11 @@ BOOL LLProfileParams::importFile(LLFILE *fp)
 		}
 	}
 
-	return TRUE;
+	return true;
 }
 
 
-BOOL LLProfileParams::exportFile(LLFILE *fp) const
+bool LLProfileParams::exportFile(LLFILE *fp) const
 {
 	fprintf(fp,"\t\tprofile 0\n");
 	fprintf(fp,"\t\t{\n");
@@ -1152,11 +1152,11 @@ BOOL LLProfileParams::exportFile(LLFILE *fp) const
 	fprintf(fp,"\t\t\tend\t%g\n", getEnd());
 	fprintf(fp,"\t\t\thollow\t%g\n", getHollow());
 	fprintf(fp, "\t\t}\n");
-	return TRUE;
+	return true;
 }
 
 
-BOOL LLProfileParams::importLegacyStream(std::istream& input_stream)
+bool LLProfileParams::importLegacyStream(std::istream& input_stream)
 {
 	const S32 BUFSIZE = 16384;
 	char buffer[BUFSIZE];	/* Flawfinder: ignore */
@@ -1211,11 +1211,11 @@ BOOL LLProfileParams::importLegacyStream(std::istream& input_stream)
 		}
 	}
 
-	return TRUE;
+	return true;
 }
 
 
-BOOL LLProfileParams::exportLegacyStream(std::ostream& output_stream) const
+bool LLProfileParams::exportLegacyStream(std::ostream& output_stream) const
 {
 	output_stream <<"\t\tprofile 0\n";
 	output_stream <<"\t\t{\n";
@@ -1224,7 +1224,7 @@ BOOL LLProfileParams::exportLegacyStream(std::ostream& output_stream) const
 	output_stream <<"\t\t\tend\t" << getEnd() << "\n";
 	output_stream <<"\t\t\thollow\t" << getHollow() << "\n";
 	output_stream << "\t\t}\n";
-	return TRUE;
+	return true;
 }
 
 LLSD LLProfileParams::asLLSD() const
@@ -1680,7 +1680,7 @@ bool LLDynamicPath::generate(const LLPathParams& params, F32 detail, S32 split,
 }
 
 
-BOOL LLPathParams::importFile(LLFILE *fp)
+bool LLPathParams::importFile(LLFILE *fp)
 {
 	const S32 BUFSIZE = 16384;
 	char buffer[BUFSIZE];	/* Flawfinder: ignore */
@@ -1795,11 +1795,11 @@ BOOL LLPathParams::importFile(LLFILE *fp)
 			LL_WARNS() << "unknown keyword " << " in path import" << LL_ENDL;
 		}
 	}
-	return TRUE;
+	return true;
 }
 
 
-BOOL LLPathParams::exportFile(LLFILE *fp) const
+bool LLPathParams::exportFile(LLFILE *fp) const
 {
 	fprintf(fp, "\t\tpath 0\n");
 	fprintf(fp, "\t\t{\n");
@@ -1820,11 +1820,11 @@ BOOL LLPathParams::exportFile(LLFILE *fp) const
 	fprintf(fp,"\t\t\tskew\t%g\n", getSkew());
 
 	fprintf(fp, "\t\t}\n");
-	return TRUE;
+	return true;
 }
 
 
-BOOL LLPathParams::importLegacyStream(std::istream& input_stream)
+bool LLPathParams::importLegacyStream(std::istream& input_stream)
 {
 	const S32 BUFSIZE = 16384;
 	char buffer[BUFSIZE];	/* Flawfinder: ignore */
@@ -1935,11 +1935,11 @@ BOOL LLPathParams::importLegacyStream(std::istream& input_stream)
 			LL_WARNS() << "unknown keyword " << " in path import" << LL_ENDL;
 		}
 	}
-	return TRUE;
+	return true;
 }
 
 
-BOOL LLPathParams::exportLegacyStream(std::ostream& output_stream) const
+bool LLPathParams::exportLegacyStream(std::ostream& output_stream) const
 {
 	output_stream << "\t\tpath 0\n";
 	output_stream << "\t\t{\n";
@@ -1960,7 +1960,7 @@ BOOL LLPathParams::exportLegacyStream(std::ostream& output_stream) const
 	output_stream <<"\t\t\tskew\t" << getSkew() << "\n";
 
 	output_stream << "\t\t}\n";
-	return TRUE;
+	return true;
 }
 
 LLSD LLPathParams::asLLSD() const
@@ -2099,7 +2099,7 @@ LLVolume::~LLVolume()
 	mHullIndices = NULL;
 }
 
-BOOL LLVolume::generate()
+bool LLVolume::generate()
 {
 	LL_PROFILE_ZONE_SCOPED_CATEGORY_VOLUME
 
@@ -2143,8 +2143,8 @@ BOOL LLVolume::generate()
 		}
 	}
 
-	BOOL regenPath = mPathp->generate(mParams.getPathParams(), path_detail, split);
-	BOOL regenProf = mProfilep->generate(mParams.getProfileParams(), mPathp->isOpen(),profile_detail, split);
+	bool regenPath = mPathp->generate(mParams.getPathParams(), path_detail, split);
+	bool regenProf = mProfilep->generate(mParams.getProfileParams(), mPathp->isOpen(),profile_detail, split);
 
 	if (regenPath || regenProf ) 
 	{
@@ -2207,11 +2207,11 @@ BOOL LLVolume::generate()
 			mFaceMask |= id;
 		}
 		LL_CHECK_MEMORY
-		return TRUE;
+		return true;
 	}
 
 	LL_CHECK_MEMORY
-	return FALSE;
+	return false;
 }
 
 void LLVolumeFace::VertexData::init()
@@ -3334,12 +3334,12 @@ void LLVolume::sculpt(U16 sculpt_width, U16 sculpt_height, S8 sculpt_components,
 
 
 
-BOOL LLVolume::isCap(S32 face)
+bool LLVolume::isCap(S32 face)
 {
 	return mProfilep->mFaces[face].mCap; 
 }
 
-BOOL LLVolume::isFlat(S32 face)
+bool LLVolume::isFlat(S32 face)
 {
 	return mProfilep->mFaces[face].mFlat;
 }
@@ -4324,7 +4324,7 @@ BOOL equalTriangle(const S32 *a, const S32 *b)
 	return FALSE;
 }
 
-BOOL LLVolumeParams::importFile(LLFILE *fp)
+bool LLVolumeParams::importFile(LLFILE *fp)
 {
 	//LL_INFOS() << "importing volume" << LL_ENDL;
 	const S32 BUFSIZE = 16384;
@@ -4364,21 +4364,21 @@ BOOL LLVolumeParams::importFile(LLFILE *fp)
 		}
 	}
 
-	return TRUE;
+	return true;
 }
 
-BOOL LLVolumeParams::exportFile(LLFILE *fp) const
+bool LLVolumeParams::exportFile(LLFILE *fp) const
 {
 	fprintf(fp,"\tshape 0\n");
 	fprintf(fp,"\t{\n");
 	mPathParams.exportFile(fp);
 	mProfileParams.exportFile(fp);
 	fprintf(fp, "\t}\n");
-	return TRUE;
+	return true;
 }
 
 
-BOOL LLVolumeParams::importLegacyStream(std::istream& input_stream)
+bool LLVolumeParams::importLegacyStream(std::istream& input_stream)
 {
 	//LL_INFOS() << "importing volume" << LL_ENDL;
 	const S32 BUFSIZE = 16384;
@@ -4414,17 +4414,17 @@ BOOL LLVolumeParams::importLegacyStream(std::istream& input_stream)
 		}
 	}
 
-	return TRUE;
+	return true;
 }
 
-BOOL LLVolumeParams::exportLegacyStream(std::ostream& output_stream) const
+bool LLVolumeParams::exportLegacyStream(std::ostream& output_stream) const
 {
 	output_stream <<"\tshape 0\n";
 	output_stream <<"\t{\n";
 	mPathParams.exportLegacyStream(output_stream);
 	mProfileParams.exportLegacyStream(output_stream);
 	output_stream << "\t}\n";
-	return TRUE;
+	return true;
 }
 
 LLSD LLVolumeParams::sculptAsLLSD() const
@@ -4498,12 +4498,12 @@ const F32 MIN_CONCAVE_PATH_WEDGE = 0.111111f;	// 1/9 unity
 
 // returns TRUE if the shape can be approximated with a convex shape 
 // for collison purposes
-BOOL LLVolumeParams::isConvex() const
+bool LLVolumeParams::isConvex() const
 {
 	if (!getSculptID().isNull())
 	{
 		// can't determine, be safe and say no:
-		return FALSE;
+		return false;
 	}
 	
 	F32 path_length = mPathParams.getEnd() - mPathParams.getBegin();
@@ -4516,7 +4516,7 @@ BOOL LLVolumeParams::isConvex() const
 				 && LL_PCODE_PATH_LINE != path_type) ) )
 	{
 		// twist along a "not too short" path is concave
-		return FALSE;
+		return false;
 	}
 
 	F32 profile_length = mProfileParams.getEnd() - mProfileParams.getBegin();
@@ -4540,36 +4540,36 @@ BOOL LLVolumeParams::isConvex() const
 	if (!convex_profile)
 	{
 		// profile is concave
-		return FALSE;
+		return false;
 	}
 
 	if ( LL_PCODE_PATH_LINE == path_type )
 	{
 		// straight paths with convex profile
-		return TRUE;
+		return true;
 	}
 
-	BOOL concave_path = (path_length < 1.0f) && (path_length > 0.5f);
+	bool concave_path = (path_length < 1.0f) && (path_length > 0.5f);
 	if (concave_path)
 	{
-		return FALSE;
+		return false;
 	}
 
 	// we're left with spheres, toroids and tubes
 	if ( LL_PCODE_PROFILE_CIRCLE_HALF == profile_type )
 	{
 		// at this stage all spheres must be convex
-		return TRUE;
+		return true;
 	}
 
 	// it's a toroid or tube		
 	if ( path_length <= MIN_CONCAVE_PATH_WEDGE )
 	{
 		// effectively convex
-		return TRUE;
+		return true;
 	}
 
-	return FALSE;
+	return false;
 }
 
 // debug
@@ -4647,7 +4647,7 @@ LLFaceID LLVolume::generateFaceMask()
 	return new_mask;
 }
 
-BOOL LLVolume::isFaceMaskValid(LLFaceID face_mask)
+bool LLVolume::isFaceMaskValid(LLFaceID face_mask)
 {
 	LLFaceID test_mask = 0;
 	for(S32 i = 0; i < getNumFaces(); i++)
@@ -4658,7 +4658,7 @@ BOOL LLVolume::isFaceMaskValid(LLFaceID face_mask)
 	return test_mask == face_mask;
 }
 
-BOOL LLVolume::isConvex() const
+bool LLVolume::isConvex() const
 {
 	// mParams.isConvex() may return FALSE even though the final
 	// geometry is actually convex due to LOD approximations.
@@ -4944,7 +4944,7 @@ void LLVolumeFace::freeData()
     destroyOctree();
 }
 
-BOOL LLVolumeFace::create(LLVolume* volume, BOOL partial_build)
+bool LLVolumeFace::create(LLVolume* volume, BOOL partial_build)
 {
 	LL_PROFILE_ZONE_SCOPED_CATEGORY_VOLUME
 
@@ -4952,7 +4952,7 @@ BOOL LLVolumeFace::create(LLVolume* volume, BOOL partial_build)
     destroyOctree();
 
 	LL_CHECK_MEMORY
-	BOOL ret = FALSE ;
+	bool ret = false ;
 	if (mTypeMask & CAP_MASK)
 	{
 		ret = createCap(volume, partial_build);
@@ -5768,7 +5768,7 @@ void	LerpPlanarVertex(LLVolumeFace::VertexData& v0,
 	vout.setNormal(v0.getNormal());
 }
 
-BOOL LLVolumeFace::createUnCutCubeCap(LLVolume* volume, BOOL partial_build)
+bool LLVolumeFace::createUnCutCubeCap(LLVolume* volume, bool partial_build)
 {
 	LL_CHECK_MEMORY		
 
@@ -6000,11 +6000,11 @@ BOOL LLVolumeFace::createUnCutCubeCap(LLVolume* volume, BOOL partial_build)
 	}
 		
 	LL_CHECK_MEMORY
-	return TRUE;
+	return true;
 }
 
 
-BOOL LLVolumeFace::createCap(LLVolume* volume, BOOL partial_build)
+bool LLVolumeFace::createCap(LLVolume* volume, bool partial_build)
 {
 	if (!(mTypeMask & HOLLOW_MASK) && 
 		!(mTypeMask & OPEN_MASK) && 
@@ -6210,36 +6210,36 @@ BOOL LLVolumeFace::createCap(LLVolume* volume, BOOL partial_build)
 							(paV[0]*pbV[1] - pbV[0]*paV[1]) +
 							(pbV[0]*p2V[1] - p2V[0]*pbV[1]);
 
-				BOOL use_tri1a2 = TRUE;
-				BOOL tri_1a2 = TRUE;
-				BOOL tri_21b = TRUE;
+				bool use_tri1a2 = true;
+				bool tri_1a2 = true;
+				bool tri_21b = true;
 
 				if (area_1a2 < 0)
 				{
-					tri_1a2 = FALSE;
+					tri_1a2 = false;
 				}
 				if (area_2ab < 0)
 				{
 					// Can't use, because it contains point b
-					tri_1a2 = FALSE;
+					tri_1a2 = false;
 				}
 				if (area_21b < 0)
 				{
-					tri_21b = FALSE;
+					tri_21b = false;
 				}
 				if (area_1ba < 0)
 				{
 					// Can't use, because it contains point b
-					tri_21b = FALSE;
+					tri_21b = false;
 				}
 
 				if (!tri_1a2)
 				{
-					use_tri1a2 = FALSE;
+					use_tri1a2 = false;
 				}
 				else if (!tri_21b)
 				{
-					use_tri1a2 = TRUE;
+					use_tri1a2 = true;
 				}
 				else
 				{
@@ -6251,11 +6251,11 @@ BOOL LLVolumeFace::createCap(LLVolume* volume, BOOL partial_build)
 
 					if (d1.dot3(d1) < d2.dot3(d2))
 					{
-						use_tri1a2 = TRUE;
+						use_tri1a2 = true;
 					}
 					else
 					{
-						use_tri1a2 = FALSE;
+						use_tri1a2 = false;
 					}
 				}
 
@@ -6316,36 +6316,36 @@ BOOL LLVolumeFace::createCap(LLVolume* volume, BOOL partial_build)
 							(paV[0]*pbV[1] - pbV[0]*paV[1]) +
 							(pbV[0]*p2V[1] - p2V[0]*pbV[1]);
 
-				BOOL use_tri1a2 = TRUE;
-				BOOL tri_1a2 = TRUE;
-				BOOL tri_21b = TRUE;
+				bool use_tri1a2 = true;
+				bool tri_1a2 = true;
+				bool tri_21b = true;
 
 				if (area_1a2 < 0)
 				{
-					tri_1a2 = FALSE;
+					tri_1a2 = false;
 				}
 				if (area_2ab < 0)
 				{
 					// Can't use, because it contains point b
-					tri_1a2 = FALSE;
+					tri_1a2 = false;
 				}
 				if (area_21b < 0)
 				{
-					tri_21b = FALSE;
+					tri_21b = false;
 				}
 				if (area_1ba < 0)
 				{
 					// Can't use, because it contains point b
-					tri_21b = FALSE;
+					tri_21b = false;
 				}
 
 				if (!tri_1a2)
 				{
-					use_tri1a2 = FALSE;
+					use_tri1a2 = false;
 				}
 				else if (!tri_21b)
 				{
-					use_tri1a2 = TRUE;
+					use_tri1a2 = true;
 				}
 				else
 				{
@@ -6356,11 +6356,11 @@ BOOL LLVolumeFace::createCap(LLVolume* volume, BOOL partial_build)
 
 					if (d1.dot3(d1) < d2.dot3(d2))
 					{
-						use_tri1a2 = TRUE;
+						use_tri1a2 = true;
 					}
 					else
 					{
-						use_tri1a2 = FALSE;
+						use_tri1a2 = false;
 					}
 				}
 
@@ -6439,7 +6439,7 @@ BOOL LLVolumeFace::createCap(LLVolume* volume, BOOL partial_build)
 		norm[i].load4a(normal.getF32ptr());
 	}
 
-	return TRUE;
+	return true;
 }
 
 void CalculateTangentArray(U32 vertexCount, const LLVector4a *vertex, const LLVector4a *normal,
@@ -6657,18 +6657,18 @@ void LLVolumeFace::fillFromLegacyData(std::vector<LLVolumeFace::VertexData>& v,
 	}
 }
 
-BOOL LLVolumeFace::createSide(LLVolume* volume, BOOL partial_build)
+bool LLVolumeFace::createSide(LLVolume* volume, bool partial_build)
 {
 	LL_PROFILE_ZONE_SCOPED_CATEGORY_VOLUME
 
 	LL_CHECK_MEMORY
-	BOOL flat = mTypeMask & FLAT_MASK;
+	bool flat = mTypeMask & FLAT_MASK;
 
 	U8 sculpt_type = volume->getParams().getSculptType();
 	U8 sculpt_stitching = sculpt_type & LL_SCULPT_TYPE_MASK;
-	BOOL sculpt_invert = sculpt_type & LL_SCULPT_FLAG_INVERT;
-	BOOL sculpt_mirror = sculpt_type & LL_SCULPT_FLAG_MIRROR;
-	BOOL sculpt_reverse_horizontal = (sculpt_invert ? !sculpt_mirror : sculpt_mirror);  // XOR
+	bool sculpt_invert = sculpt_type & LL_SCULPT_FLAG_INVERT;
+	bool sculpt_mirror = sculpt_type & LL_SCULPT_FLAG_MIRROR;
+	bool sculpt_reverse_horizontal = (sculpt_invert ? !sculpt_mirror : sculpt_mirror);  // XOR
 	
 	S32 num_vertices, num_indices;
 
@@ -7039,10 +7039,10 @@ BOOL LLVolumeFace::createSide(LLVolume* volume, BOOL partial_build)
 	
 	LLVector4a top;
 	top.setSub(pos[0], pos[mNumS*(mNumT-2)]);
-	BOOL s_bottom_converges = (top.dot3(top) < 0.000001f);
+	bool s_bottom_converges = (top.dot3(top) < 0.000001f);
 
 	top.setSub(pos[mNumS-1], pos[mNumS*(mNumT-2)+mNumS-1]);
-	BOOL s_top_converges = (top.dot3(top) < 0.000001f);
+	bool s_top_converges = (top.dot3(top) < 0.000001f);
 
 	if (sculpt_stitching == LL_SCULPT_TYPE_NONE)  // logic for non-sculpt volumes
 	{
@@ -7090,20 +7090,20 @@ BOOL LLVolumeFace::createSide(LLVolume* volume, BOOL partial_build)
 	}
 	else  // logic for sculpt volumes
 	{
-		BOOL average_poles = FALSE;
-		BOOL wrap_s = FALSE;
-		BOOL wrap_t = FALSE;
+		bool average_poles = false;
+		bool wrap_s = false;
+		bool wrap_t = false;
 
 		if (sculpt_stitching == LL_SCULPT_TYPE_SPHERE)
-			average_poles = TRUE;
+			average_poles = true;
 
 		if ((sculpt_stitching == LL_SCULPT_TYPE_SPHERE) ||
 			(sculpt_stitching == LL_SCULPT_TYPE_TORUS) ||
 			(sculpt_stitching == LL_SCULPT_TYPE_CYLINDER))
-			wrap_s = TRUE;
+			wrap_s = true;
 
 		if (sculpt_stitching == LL_SCULPT_TYPE_TORUS)
-			wrap_t = TRUE;
+			wrap_t = true;
 			
 		
 		if (average_poles)
@@ -7168,7 +7168,7 @@ BOOL LLVolumeFace::createSide(LLVolume* volume, BOOL partial_build)
 
 	LL_CHECK_MEMORY
 
-	return TRUE;
+	return true;
 }
 
 //adapted from Lengyel, Eric. "Computing Tangent Space Basis Vectors for an Arbitrary Mesh". Terathon Software 3D Graphics Library, 2001. http://www.terathon.com/code/tangent.html
diff --git a/indra/llmath/llvolume.h b/indra/llmath/llvolume.h
index 0158ca9bcd..4ea0604f26 100644
--- a/indra/llmath/llvolume.h
+++ b/indra/llmath/llvolume.h
@@ -201,7 +201,7 @@ const U8 LL_SCULPT_FLAG_MASK = LL_SCULPT_FLAG_INVERT | LL_SCULPT_FLAG_MIRROR;
 
 const S32 LL_SCULPT_MESH_MAX_FACES = 8;
 
-extern BOOL gDebugGL;
+extern bool gDebugGL;
 
 class LLProfileParams
 {
@@ -254,11 +254,11 @@ public:
 	
 	void copyParams(const LLProfileParams &params);
 
-	BOOL importFile(LLFILE *fp);
-	BOOL exportFile(LLFILE *fp) const;
+	bool importFile(LLFILE *fp);
+	bool exportFile(LLFILE *fp) const;
 
-	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;
 
 	LLSD asLLSD() const;
 	operator LLSD() const { return asLLSD(); }
@@ -390,11 +390,11 @@ public:
 
 	void copyParams(const LLPathParams &params);
 
-	BOOL importFile(LLFILE *fp);
-	BOOL exportFile(LLFILE *fp) const;
+	bool importFile(LLFILE *fp);
+	bool exportFile(LLFILE *fp) const;
 
-	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;
 
 	LLSD asLLSD() const;
 	operator LLSD() const { return asLLSD(); }
@@ -582,11 +582,11 @@ public:
 	const LLPathParams &getPathParams() const {return mPathParams;}
 	LLPathParams &getPathParams() {return mPathParams;}
 
-	BOOL importFile(LLFILE *fp);
-	BOOL exportFile(LLFILE *fp) const;
+	bool importFile(LLFILE *fp);
+	bool exportFile(LLFILE *fp) const;
 
-	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;
 
 	LLSD sculptAsLLSD() const;
 	bool sculptFromLLSD(LLSD& sd);
@@ -652,7 +652,7 @@ public:
 	const U8& getSculptType() const     { return mSculptType;                   }
 	bool isSculpt() const;
 	bool isMeshSculpt() const;
-	BOOL isConvex() const;
+	bool isConvex() const;
 
 	// 'begin' and 'end' should be in range [0, 1] (they will be clamped)
 	// (begin, end) = (0, 1) will not change the volume
@@ -870,7 +870,7 @@ private:
 	void freeData();
 public:
 
-	BOOL create(LLVolume* volume, BOOL partial_build = FALSE);
+	bool create(LLVolume* volume, BOOL partial_build = FALSE);
 	void createTangents();
 	
 	void resizeVertices(S32 num_verts);
@@ -990,9 +990,9 @@ private:
     LLOctreeNode<LLVolumeTriangle, LLVolumeTriangle*>* mOctree;
     LLVolumeTriangle* mOctreeTriangles;
 
-	BOOL createUnCutCubeCap(LLVolume* volume, BOOL partial_build = FALSE);
-	BOOL createCap(LLVolume* volume, BOOL partial_build = FALSE);
-	BOOL createSide(LLVolume* volume, BOOL partial_build = FALSE);
+	bool createUnCutCubeCap(LLVolume* volume, bool partial_build = false);
+	bool createCap(LLVolume* volume, bool partial_build = false);
+	bool createSide(LLVolume* volume, bool partial_build = false);
 };
 
 class LLVolume : public LLRefCount
@@ -1036,10 +1036,10 @@ public:
 	void regen();
     void genTangents(S32 face);
 
-	BOOL isConvex() const;
-	BOOL isCap(S32 face);
-	BOOL isFlat(S32 face);
-	BOOL isUnique() const									{ return mUnique; }
+	bool isConvex() const;
+	bool isCap(S32 face);
+	bool isFlat(S32 face);
+	bool isUnique() const									{ return mUnique; }
 
 	S32 getSculptLevel() const                              { return mSculptLevel; }
 	void setSculptLevel(S32 level)							{ mSculptLevel = level; }
@@ -1069,7 +1069,7 @@ public:
 
 	LLFaceID generateFaceMask();
 
-	BOOL isFaceMaskValid(LLFaceID face_mask);
+	bool isFaceMaskValid(LLFaceID face_mask);
 	static S32 sNumMeshPoints;
 
 	friend std::ostream& operator<<(std::ostream &s, const LLVolume &volume);
@@ -1100,7 +1100,7 @@ private:
 	void sculptGenerateSpherePlaceholder();
 
 protected:
-	BOOL generate();
+	bool generate();
 	void createVolumeFaces();
 public:
 	bool unpackVolumeFaces(std::istream& is, S32 size);
@@ -1128,7 +1128,7 @@ public:
 	LLAlignedArray<LLVector4a,64> mMesh;
 	
 	
-	BOOL mGenerateSingleFace;
+	bool mGenerateSingleFace;
 	face_list_t mVolumeFaces;
 
 public:
diff --git a/indra/llmath/xform.cpp b/indra/llmath/xform.cpp
index 5d8b93d5e8..8999abda60 100644
--- a/indra/llmath/xform.cpp
+++ b/indra/llmath/xform.cpp
@@ -52,12 +52,12 @@ LLXform* LLXform::getRoot() const
 	return (LLXform*)root;
 }
 
-BOOL LLXform::isRoot() const
+bool LLXform::isRoot() const
 {
 	return (!mParent);
 }
 
-BOOL LLXform::isRootEdit() const
+bool LLXform::isRootEdit() const
 {
 	return (!mParent);
 }
diff --git a/indra/llmath/xform.h b/indra/llmath/xform.h
index 54b0f6d9ec..96c4ab4d51 100644
--- a/indra/llmath/xform.h
+++ b/indra/llmath/xform.h
@@ -86,7 +86,7 @@ public:
 
 	void getLocalMat4(LLMatrix4 &mat) const { mat.initAll(mScale, mRotation, mPosition); }
 
-	inline BOOL setParent(LLXform *parent);
+	inline bool setParent(LLXform *parent);
 
 	inline void setPosition(const LLVector3& pos);
 	inline void setPosition(const F32 x, const F32 y, const F32 z);
@@ -119,8 +119,8 @@ public:
 
 	LLXform* getParent() const { return mParent; }
 	LLXform* getRoot() const;
-	virtual BOOL isRoot() const;
-	virtual BOOL isRootEdit() const;
+	virtual bool isRoot() const;
+	virtual bool isRootEdit() const;
 
 	const LLVector3&	getPosition()  const	    { return mPosition; }
 	const LLVector3&	getScale() const			{ return mScale; }
@@ -159,12 +159,12 @@ protected:
 
 };
 
-BOOL LLXform::setParent(LLXform* parent)
+bool LLXform::setParent(LLXform* parent)
 {
 	// Validate and make sure we're not creating a loop
 	if (parent == mParent)
 	{
-		return TRUE;
+		return true;
 	}
 	if (parent)
 	{
@@ -174,13 +174,13 @@ BOOL LLXform::setParent(LLXform* parent)
 			if (cur_par == this)
 			{
 				//warn("LLXform::setParent Creating loop when setting parent!");
-				return FALSE;
+				return false;
 			}
 			cur_par = cur_par->mParent;
 		}
 	}
 	mParent = parent;
-	return TRUE;
+	return true;
 }
 
 void LLXform::setPosition(const LLVector3& pos)