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

1 files changed, 8 insertions, 8 deletions

diff --git a/indra/llmessage/llmessagethrottle.cpp b/indra/llmessage/llmessagethrottle.cpp
index ef4f3702fc..abcb1085ba 100644
--- a/indra/llmessage/llmessagethrottle.cpp
+++ b/indra/llmessage/llmessagethrottle.cpp
@@ -66,13 +66,13 @@ void LLMessageThrottle::pruneEntries()
 
         // Look for the first entry younger than the maximum age.
         F32 max_age = (F32)MAX_MESSAGE_AGE[cat];
-        BOOL found = FALSE;
+        bool found = false;
         while (r_iterator != r_last && !found)
         {
             if ( LLFrameTimer::getTotalTime() - (*r_iterator).getEntryTime() < max_age )
             {
                 // We found a young enough entry.
-                found = TRUE;
+                found = true;
 
                 // Did we find at least one entry to remove?
                 if (r_iterator != message_list->rbegin())
@@ -95,7 +95,7 @@ void LLMessageThrottle::pruneEntries()
     }
 }
 
-BOOL LLMessageThrottle::addViewerAlert(const LLUUID& to, const std::string& mesg)
+bool LLMessageThrottle::addViewerAlert(const LLUUID& to, const std::string& mesg)
 {
     message_list_t* message_list = &(mMessageList[MTC_VIEWER_ALERT]);
 
@@ -114,16 +114,16 @@ BOOL LLMessageThrottle::addViewerAlert(const LLUUID& to, const std::string& mesg
     {
         // This message was not found.  Add it to the list.
         message_list->push_front(entry);
-        return TRUE;
+        return true;
     }
     else
     {
         // This message was already in the list.
-        return FALSE;
+        return false;
     }
 }
 
-BOOL LLMessageThrottle::addAgentAlert(const LLUUID& agent, const LLUUID& task, const std::string& mesg)
+bool LLMessageThrottle::addAgentAlert(const LLUUID& agent, const LLUUID& task, const std::string& mesg)
 {
     message_list_t* message_list = &(mMessageList[MTC_AGENT_ALERT]);
 
@@ -142,12 +142,12 @@ BOOL LLMessageThrottle::addAgentAlert(const LLUUID& agent, const LLUUID& task, c
     {
         // This message was not found.  Add it to the list.
         message_list->push_front(entry);
-        return TRUE;
+        return true;
     }
     else
     {
         // This message was already in the list.
-        return FALSE;
+        return false;
     }
 }