Merge pull request #1745 from secondlife/project/gltf_development

move project/gltf development to develop

1 files changed, 5 insertions, 5 deletions

diff --git a/indra/llcharacter/lleditingmotion.cpp b/indra/llcharacter/lleditingmotion.cpp
index b46f210d2b..9fb2a931f9 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
@@ -155,25 +155,25 @@ BOOL LLEditingMotion::onActivate()
     mShoulderJoint.setRotation( mShoulderState->getJoint()->getRotation() );
     mElbowJoint.setRotation(    mElbowState->getJoint()->getRotation() );
 
-    return TRUE;
+    return true;
 }
 
 //-----------------------------------------------------------------------------
 // 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)
     {
         focus_pt = mLastSelectPt;
-        result = FALSE;
+        result = false;
     }
     else
     {