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

1 files changed, 15 insertions, 15 deletions

diff --git a/indra/newview/llchathistory.cpp b/indra/newview/llchathistory.cpp
index 4a08eace62..fc50691ece 100644
--- a/indra/newview/llchathistory.cpp
+++ b/indra/newview/llchathistory.cpp
@@ -90,7 +90,7 @@ public:
         }
 
         LLUUID object_id;
-        if (!object_id.set(params[0], FALSE))
+        if (!object_id.set(params[0], false))
         {
             return false;
         }
@@ -155,7 +155,7 @@ public:
         }
     }
 
-    BOOL handleMouseUp(S32 x, S32 y, MASK mask)
+    bool handleMouseUp(S32 x, S32 y, MASK mask)
     {
         return LLPanel::handleMouseUp(x,y,mask);
     }
@@ -577,7 +577,7 @@ public:
         return false;
     }
 
-    BOOL postBuild()
+    bool postBuild()
     {
         setDoubleClickCallback(boost::bind(&LLChatHistoryHeader::showInspector, this));
 
@@ -591,7 +591,7 @@ public:
         if (mInfoCtrl)
         {
             mInfoCtrl->setCommitCallback(boost::bind(&LLChatHistoryHeader::onClickInfoCtrl, mInfoCtrl));
-            mInfoCtrl->setVisible(FALSE);
+            mInfoCtrl->setVisible(false);
         }
         else
         {
@@ -619,12 +619,12 @@ public:
         return  child->pointInView(local_x, local_y);
     }
 
-    BOOL handleRightMouseDown(S32 x, S32 y, MASK mask)
+    bool handleRightMouseDown(S32 x, S32 y, MASK mask)
     {
         if(pointInChild("avatar_icon",x,y) || pointInChild("user_name",x,y))
         {
             showContextMenu(x,y);
-            return TRUE;
+            return true;
         }
 
         return LLPanel::handleRightMouseDown(x,y,mask);
@@ -695,7 +695,7 @@ public:
             updateMinUserNameWidth();
             LLColor4 sep_color = LLUIColorTable::instance().getColor("ChatTeleportSeparatorColor");
             setTransparentColor(sep_color);
-            mTimeBoxTextBox->setVisible(FALSE);
+            mTimeBoxTextBox->setVisible(false);
         }
         else if (chat.mFromName.empty()
                  || mSourceType == CHAT_SOURCE_SYSTEM)
@@ -725,8 +725,8 @@ public:
                  mSourceType == CHAT_SOURCE_AGENT)
         {
             //if it's an avatar name with a username add formatting
-            S32 username_start = chat.mFromName.rfind(" (");
-            S32 username_end = chat.mFromName.rfind(')');
+            auto username_start = chat.mFromName.rfind(" (");
+            auto username_end = chat.mFromName.rfind(')');
 
             if (username_start != std::string::npos &&
                 username_end == (chat.mFromName.length() - 1))
@@ -744,7 +744,7 @@ public:
                     style_params_name.font.name("SansSerifSmall");
                     style_params_name.font.style("NORMAL");
                     style_params_name.readonly_color(userNameColor);
-                    user_name->appendText("  - " + username, FALSE, style_params_name);
+                    user_name->appendText("  - " + username, false, style_params_name);
                 }
             }
             else
@@ -830,7 +830,7 @@ public:
             user_name->reshape(user_name_rect.getWidth(), user_name_rect.getHeight());
             user_name->setRect(user_name_rect);
 
-            time_box->setVisible(TRUE);
+            time_box->setVisible(true);
         }
 
         LLPanel::draw();
@@ -982,7 +982,7 @@ protected:
 
     void hideInfoCtrl()
     {
-        mInfoCtrl->setVisible(FALSE);
+        mInfoCtrl->setVisible(false);
     }
 
 private:
@@ -1042,7 +1042,7 @@ private:
             style_params_name.font.name("SansSerifSmall");
             style_params_name.font.style("NORMAL");
             style_params_name.readonly_color(userNameColor);
-            user_name->appendText("  - " + av_name.getUserName(), FALSE, style_params_name);
+            user_name->appendText("  - " + av_name.getUserName(), false, style_params_name);
         }
         setToolTip( av_name.getUserName() );
         // name might have changed, update width
@@ -1223,7 +1223,7 @@ void LLChatHistory::appendMessage(const LLChat& chat, const LLSD &args, const LL
     if (mNotifyAboutUnreadMsg && !mEditor->scrolledToEnd() && !from_me && !chat.mFromName.empty())
     {
         mUnreadChatSources.insert(chat.mFromName);
-        mMoreChatPanel->setVisible(TRUE);
+        mMoreChatPanel->setVisible(true);
         std::string chatters;
         for (const std::string& source : mUnreadChatSources)
         {
@@ -1541,7 +1541,7 @@ void LLChatHistory::draw()
     if (mEditor->scrolledToEnd())
     {
         mUnreadChatSources.clear();
-        mMoreChatPanel->setVisible(FALSE);
+        mMoreChatPanel->setVisible(false);
     }
 
     LLUICtrl::draw();