Merge branch 'develop' of github.com:secondlife/viewer into roxie/webrtc-voice

1 files changed, 15 insertions, 15 deletions

diff --git a/indra/llappearance/lldriverparam.cpp b/indra/llappearance/lldriverparam.cpp
index 4a2db2aefb..2e933f9357 100644
--- a/indra/llappearance/lldriverparam.cpp
+++ b/indra/llappearance/lldriverparam.cpp
@@ -41,16 +41,16 @@ LLDriverParamInfo::LLDriverParamInfo() :
 {
 }
 
-BOOL LLDriverParamInfo::parseXml(LLXmlTreeNode* node)
+bool LLDriverParamInfo::parseXml(LLXmlTreeNode* node)
 {
     llassert( node->hasName( "param" ) && node->getChildByName( "param_driver" ) );
 
     if( !LLViewerVisualParamInfo::parseXml( node ))
-        return FALSE;
+        return false;
 
     LLXmlTreeNode* param_driver_node = node->getChildByName( "param_driver" );
     if( !param_driver_node )
-        return FALSE;
+        return false;
 
     for (LLXmlTreeNode* child = param_driver_node->getChildByName( "driven" );
          child;
@@ -90,10 +90,10 @@ BOOL LLDriverParamInfo::parseXml(LLXmlTreeNode* node)
         else
         {
             LL_ERRS() << "<driven> Unable to resolve driven parameter: " << driven_id << LL_ENDL;
-            return FALSE;
+            return false;
         }
     }
-    return TRUE;
+    return true;
 }
 
 //virtual
@@ -187,18 +187,18 @@ LLDriverParam::~LLDriverParam()
 {
 }
 
-BOOL LLDriverParam::setInfo(LLDriverParamInfo *info)
+bool LLDriverParam::setInfo(LLDriverParamInfo *info)
 {
     llassert(mInfo == NULL);
     if (info->mID < 0)
-        return FALSE;
+        return false;
     mInfo = info;
     mID = info->mID;
     info->mDriverParam = this;
 
     setWeight(getDefaultWeight());
 
-    return TRUE;
+    return true;
 }
 
 /*virtual*/ LLViewerVisualParam* LLDriverParam::cloneParam(LLWearable* wearable) const
@@ -422,7 +422,7 @@ const LLVector4a*   LLDriverParam::getNextDistortion(U32 *index, LLPolyMesh **po
 
 S32 LLDriverParam::getDrivenParamsCount() const
 {
-    return mDriven.size();
+    return static_cast<S32>(mDriven.size());
 }
 
 const LLViewerVisualParam* LLDriverParam::getDrivenParam(S32 index) const
@@ -461,25 +461,25 @@ void LLDriverParam::stopAnimating()
 
     for(LLDrivenEntry& driven : mDriven)
     {
-        driven.mParam->setAnimating(FALSE);
+        driven.mParam->setAnimating(false);
     }
 }
 
 /*virtual*/
-BOOL LLDriverParam::linkDrivenParams(visual_param_mapper mapper, BOOL only_cross_params)
+bool LLDriverParam::linkDrivenParams(visual_param_mapper mapper, bool only_cross_params)
 {
-    BOOL success = TRUE;
+    bool success = true;
     for (LLDrivenEntryInfo& driven_info : getInfo()->mDrivenInfoList)
     {
         S32 driven_id = driven_info.mDrivenID;
 
         // check for already existing links. Do not overwrite.
-        BOOL found = FALSE;
+        bool found = false;
         for (auto& driven : mDriven)
         {
             if (driven.mInfo->mDrivenID == driven_id)
             {
-                found = TRUE;
+                found = true;
             }
         }
 
@@ -494,7 +494,7 @@ BOOL LLDriverParam::linkDrivenParams(visual_param_mapper mapper, BOOL only_cross
             }
             else
             {
-                success = FALSE;
+                success = false;
             }
         }
     }