Merge remote-tracking branch 'origin/DRTVWR-600-maint-A' into gltf-dev-maint-a-merge

1 files changed, 4 insertions, 4 deletions

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);