1 files changed, 22 insertions, 22 deletions

diff --git a/indra/newview/llflexibleobject.cpp b/indra/newview/llflexibleobject.cpp
index e935bc5553..74298c2b3d 100644
--- a/indra/newview/llflexibleobject.cpp
+++ b/indra/newview/llflexibleobject.cpp
@@ -60,8 +60,8 @@ LLVolumeImplFlexible::LLVolumeImplFlexible(LLViewerObject* vo, LLFlexibleObjectD
 {
 	static U32 seed = 0;
 	mID = seed++;
-	mInitialized = FALSE;
-	mUpdated = FALSE;
+	mInitialized = false;
+	mUpdated = false;
 	mInitializedRes = -1;
 	mSimulateRes = 0;
 	mCollisionSphereRadius = 0.f;
@@ -119,7 +119,7 @@ LLQuaternion LLVolumeImplFlexible::getFrameRotation() const
 	return mVO->getRenderRotation();
 }
 
-void LLVolumeImplFlexible::onParameterChanged(U16 param_type, LLNetworkData *data, BOOL in_use, bool local_origin)
+void LLVolumeImplFlexible::onParameterChanged(U16 param_type, LLNetworkData *data, bool in_use, bool local_origin)
 {
 	if (param_type == LLNetworkData::PARAMS_FLEXIBLE)
 	{
@@ -324,7 +324,7 @@ void LLVolumeImplFlexible::updateRenderRes()
 	{
 		mSimulateRes = new_res;
 		setAttributesOfAllSections();
-		mInitialized = TRUE;
+		mInitialized = true;
 	}
 }
 //---------------------------------------------------------------------------------
@@ -433,7 +433,7 @@ void LLVolumeImplFlexible::doFlexibleUpdate()
 	LLPath *path = &volume->getPath();
 	if ((mSimulateRes == 0 || !mInitialized) && mVO->mDrawable->isVisible()) 
 	{
-		BOOL force_update = mSimulateRes == 0 ? TRUE : FALSE;
+		bool force_update = mSimulateRes == 0;
 		doIdleUpdate();
 
 		if (!force_update || !gPipeline.hasRenderDebugFeatureMask(LLPipeline::RENDER_DEBUG_FEATURE_FLEXIBLE))
@@ -442,10 +442,10 @@ void LLVolumeImplFlexible::doFlexibleUpdate()
 		}
 	}
 
-	if(!mInitialized || !mAttributes)
+	if (!mInitialized || !mAttributes)
 	{
 		//the object is not visible
-		return ;
+		return;
 	}
 
 	// Fix for MAINT-1894
@@ -456,7 +456,7 @@ void LLVolumeImplFlexible::doFlexibleUpdate()
 	{
 		return;
 	}
-	
+
 	S32 num_sections = 1 << mSimulateRes;
 
     F32 secondsThisFrame = mTimer.getElapsedTimeAndResetF32();
@@ -668,7 +668,7 @@ void LLVolumeImplFlexible::doFlexibleUpdate()
 	S32 num_render_sections = 1<<mRenderRes;
 	if (path->getPathLength() != num_render_sections+1)
 	{
-		((LLVOVolume*) mVO)->mVolumeChanged = TRUE;
+		((LLVOVolume*) mVO)->mVolumeChanged = true;
 		volume->resizePath(num_render_sections+1);
 	}
 
@@ -708,7 +708,7 @@ void LLVolumeImplFlexible::doFlexibleUpdate()
 		if (!mUpdated || (np-pos).magVec()/mVO->mDrawable->mDistanceWRTCamera > 0.001f)
 		{
 			new_point->mPos.load3((newSection[i].mPosition * rel_xform).mV);
-			mUpdated = FALSE;
+			mUpdated = false;
 		}
 
 		new_point->mRot.loadu(LLMatrix3(rot));
@@ -741,17 +741,17 @@ void LLVolumeImplFlexible::doFlexibleRebuild(bool rebuild_volume)
         volume->regen();
     }
 	
-	mUpdated = TRUE;
+	mUpdated = true;
 }
 
 //------------------------------------------------------------------
 
-void LLVolumeImplFlexible::onSetScale(const LLVector3& scale, BOOL damped)
+void LLVolumeImplFlexible::onSetScale(const LLVector3& scale, bool damped)
 {
 	setAttributesOfAllSections((LLVector3*) &scale);
 }
 
-BOOL LLVolumeImplFlexible::doUpdateGeometry(LLDrawable *drawable)
+bool LLVolumeImplFlexible::doUpdateGeometry(LLDrawable *drawable)
 {
     LL_PROFILE_ZONE_SCOPED;
 	LLVOVolume *volume = (LLVOVolume*)mVO;
@@ -770,21 +770,21 @@ BOOL LLVolumeImplFlexible::doUpdateGeometry(LLDrawable *drawable)
 			LLVOAvatar* avatar = (LLVOAvatar*) parent;
 			if (avatar->isImpostor() && !avatar->needsImpostorUpdate())
 			{
-				return TRUE;
+				return true;
 			}
 		}
 	}
 
 	if (volume->mDrawable.isNull())
 	{
-		return TRUE; // No update to complete
+		return true; // No update to complete
 	}
 
 	if (volume->mLODChanged)
 	{
 		LLVolumeParams volume_params = volume->getVolume()->getParams();
 		volume->setVolume(volume_params, 0);
-		mUpdated = FALSE;
+		mUpdated = false;
 	}
 
 	volume->updateRelativeXform();
@@ -792,12 +792,12 @@ BOOL LLVolumeImplFlexible::doUpdateGeometry(LLDrawable *drawable)
 	doFlexibleUpdate();
 	
 	// Object may have been rotated, which means it needs a rebuild.  See SL-47220
-	BOOL	rotated = FALSE;
+	bool	rotated = false;
 	LLQuaternion cur_rotation = getFrameRotation();
 	if ( cur_rotation != mLastFrameRotation )
 	{
 		mLastFrameRotation = cur_rotation;
-		rotated = TRUE;
+		rotated = true;
 	}
 
 	if (volume->mLODChanged || volume->mFaceMappingChanged ||
@@ -822,14 +822,14 @@ BOOL LLVolumeImplFlexible::doUpdateGeometry(LLDrawable *drawable)
 		volume->genBBoxes(isVolumeGlobal());
 	}
 			
-	volume->mVolumeChanged = FALSE;
-	volume->mLODChanged = FALSE;
-	volume->mFaceMappingChanged = FALSE;
+	volume->mVolumeChanged = false;
+	volume->mLODChanged = false;
+	volume->mFaceMappingChanged = false;
 
 	// clear UV flag
 	drawable->clearState(LLDrawable::UV);
 	
-	return TRUE;
+	return true;
 }
 
 //----------------------------------------------------------------------------------