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

1 files changed, 4 insertions, 4 deletions

diff --git a/indra/newview/llpanelavatartag.cpp b/indra/newview/llpanelavatartag.cpp
index 2c11364dcc..124645e3f9 100644
--- a/indra/newview/llpanelavatartag.cpp
+++ b/indra/newview/llpanelavatartag.cpp
@@ -48,12 +48,12 @@ LLPanelAvatarTag::~LLPanelAvatarTag()
     // Name callbacks will be automatically disconnected since LLPanel is trackable
 }
 
-BOOL LLPanelAvatarTag::postBuild()
+bool LLPanelAvatarTag::postBuild()
 {
     mIcon = getChild<LLAvatarIconCtrl>("avatar_tag_icon");
     mName = getChild<LLTextBox>("sender_tag_name");
     mTime = getChild<LLTextBox>("tag_time");
-    return TRUE;
+    return true;
 }
 
 void LLPanelAvatarTag::draw()
@@ -89,10 +89,10 @@ boost::signals2::connection LLPanelAvatarTag::setLeftButtonClickCallback(
     return setCommitCallback(cb);
 }
 
-BOOL LLPanelAvatarTag::handleMouseDown(S32 x, S32 y, MASK mask)
+bool LLPanelAvatarTag::handleMouseDown(S32 x, S32 y, MASK mask)
 {
     onCommit();
-    return TRUE;
+    return true;
 }
 
 void LLPanelAvatarTag::onClick()