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

1 files changed, 3 insertions, 3 deletions

diff --git a/indra/llmessage/llmessagereader.cpp b/indra/llmessage/llmessagereader.cpp
index bed8655cf7..4d4bf679ed 100644
--- a/indra/llmessage/llmessagereader.cpp
+++ b/indra/llmessage/llmessagereader.cpp
@@ -27,7 +27,7 @@
 #include "linden_common.h"
 #include "llmessagereader.h"
 
-static BOOL sTimeDecodes = FALSE;
+static bool sTimeDecodes = false;
 
 static F32 sTimeDecodesSpamThreshold = 0.05f;
 
@@ -38,7 +38,7 @@ LLMessageReader::~LLMessageReader()
 }
 
 //static
-void LLMessageReader::setTimeDecodes(BOOL b)
+void LLMessageReader::setTimeDecodes(bool b)
 {
     sTimeDecodes = b;
 }
@@ -50,7 +50,7 @@ void LLMessageReader::setTimeDecodesSpamThreshold(F32 seconds)
 }
 
 //static
-BOOL LLMessageReader::getTimeDecodes()
+bool LLMessageReader::getTimeDecodes()
 {
     return sTimeDecodes;
 }