Merge pull request #1745 from secondlife/project/gltf_development

move project/gltf development to develop

1 files changed, 8 insertions, 8 deletions

diff --git a/indra/newview/llhudicon.cpp b/indra/newview/llhudicon.cpp
index dfff6c1dc4..8fa4118a40 100644
--- a/indra/newview/llhudicon.cpp
+++ b/indra/newview/llhudicon.cpp
@@ -65,7 +65,7 @@ LLHUDIcon::LLHUDIcon(const U8 type) :
             LLHUDObject(type),
             mImagep(NULL),
             mScale(0.1f),
-            mHidden(FALSE)
+            mHidden(false)
 {
     sIconInstances.push_back(this);
 }
@@ -186,15 +186,15 @@ void LLHUDIcon::markDead()
     LLHUDObject::markDead();
 }
 
-BOOL LLHUDIcon::lineSegmentIntersect(const LLVector4a& start, const LLVector4a& end, LLVector4a* intersection)
+bool LLHUDIcon::lineSegmentIntersect(const LLVector4a& start, const LLVector4a& end, LLVector4a* intersection)
 {
     if (mHidden)
-        return FALSE;
+        return false;
 
     if (mSourceObject.isNull() || mImagep.isNull())
     {
         markDead();
-        return FALSE;
+        return false;
     }
 
     LLVector3 obj_position = mSourceObject->getRenderPosition();
@@ -233,7 +233,7 @@ BOOL LLHUDIcon::lineSegmentIntersect(const LLVector4a& start, const LLVector4a&
     if (time_elapsed > MAX_VISIBLE_TIME)
     {
         markDead();
-        return FALSE;
+        return false;
     }
 
     F32 image_aspect = (F32)mImagep->getFullWidth() / (F32)mImagep->getFullHeight() ;
@@ -272,10 +272,10 @@ BOOL LLHUDIcon::lineSegmentIntersect(const LLVector4a& start, const LLVector4a&
             dir.mul(t);
             intersection->setAdd(start, dir);
         }
-        return TRUE;
+        return true;
     }
 
-    return FALSE;
+    return false;
 }
 
 //static
@@ -312,7 +312,7 @@ void LLHUDIcon::updateAll()
 }
 
 //static
-BOOL LLHUDIcon::iconsNearby()
+bool LLHUDIcon::iconsNearby()
 {
     return !sIconInstances.empty();
 }