Merge branch 'DRTVWR-600-maint-A' into signal/trim-trailing

1 files changed, 5 insertions, 5 deletions

diff --git a/indra/newview/llhudobject.cpp b/indra/newview/llhudobject.cpp
index e922e8230c..e6fbfbfb38 100644
--- a/indra/newview/llhudobject.cpp
+++ b/indra/newview/llhudobject.cpp
@@ -52,7 +52,7 @@ struct hud_object_further_away
 
 bool hud_object_further_away::operator()(const LLPointer<LLHUDObject>& lhs, const LLPointer<LLHUDObject>& rhs) const
 {
-    return (lhs->getDistance() > rhs->getDistance()) ? true : false;
+    return lhs->getDistance() > rhs->getDistance();
 }
 
 
@@ -61,9 +61,9 @@ LLHUDObject::LLHUDObject(const U8 type) :
     mSourceObject(NULL),
     mTargetObject(NULL)
 {
-    mVisible = TRUE;
+    mVisible = true;
     mType = type;
-    mDead = FALSE;
+    mDead = false;
 }
 
 LLHUDObject::~LLHUDObject()
@@ -72,8 +72,8 @@ LLHUDObject::~LLHUDObject()
 
 void LLHUDObject::markDead()
 {
-    mVisible = FALSE;
-    mDead = TRUE;
+    mVisible = false;
+    mDead = true;
     mSourceObject = NULL;
     mTargetObject = NULL;
 }