Merge branch 'release/luau-scripting' into lua-resultset

1 files changed, 16 insertions, 16 deletions

diff --git a/indra/llmessage/llsdmessagebuilder.cpp b/indra/llmessage/llsdmessagebuilder.cpp
index 4c678b235b..8d7d51e13f 100644
--- a/indra/llmessage/llsdmessagebuilder.cpp
+++ b/indra/llmessage/llsdmessagebuilder.cpp
@@ -44,8 +44,8 @@ LLSDMessageBuilder::LLSDMessageBuilder() :
     mCurrentBlock(NULL),
     mCurrentMessageName(""),
     mCurrentBlockName(""),
-    mbSBuilt(FALSE),
-    mbSClear(TRUE)
+    mbSBuilt(false),
+    mbSClear(true)
 {
 }
 
@@ -58,8 +58,8 @@ LLSDMessageBuilder::~LLSDMessageBuilder()
 // virtual
 void LLSDMessageBuilder::newMessage(const char* name)
 {
-    mbSBuilt = FALSE;
-    mbSClear = FALSE;
+    mbSBuilt = false;
+    mbSClear = false;
 
     mCurrentMessage = LLSD::emptyMap();
     mCurrentMessageName = (char*)name;
@@ -68,8 +68,8 @@ void LLSDMessageBuilder::newMessage(const char* name)
 // virtual
 void LLSDMessageBuilder::clearMessage()
 {
-    mbSBuilt = FALSE;
-    mbSClear = TRUE;
+    mbSBuilt = false;
+    mbSClear = true;
 
     mCurrentMessage = LLSD::emptyMap();
     mCurrentMessageName = "";
@@ -96,10 +96,10 @@ void LLSDMessageBuilder::nextBlock(const char* blockname)
 }
 
 // TODO: Remove this horror...
-BOOL LLSDMessageBuilder::removeLastBlock()
+bool LLSDMessageBuilder::removeLastBlock()
 {
     /* TODO: finish implementing this */
-    return FALSE;
+    return false;
 }
 
 void LLSDMessageBuilder::addBinaryData(
@@ -168,9 +168,9 @@ void LLSDMessageBuilder::addIPPort(const char* varname, U16 v)
     (*mCurrentBlock)[varname] = v;
 }
 
-void LLSDMessageBuilder::addBOOL(const char* varname, BOOL v)
+void LLSDMessageBuilder::addBOOL(const char* varname, bool v)
 {
-    (*mCurrentBlock)[varname] = (v == TRUE);
+    (*mCurrentBlock)[varname] = v;
 }
 
 void LLSDMessageBuilder::addString(const char* varname, const char* v)
@@ -218,9 +218,9 @@ void LLSDMessageBuilder::compressMessage(U8*& buf_ptr, U32& buffer_length)
 {
 }
 
-BOOL LLSDMessageBuilder::isMessageFull(const char* blockname) const
+bool LLSDMessageBuilder::isMessageFull(const char* blockname) const
 {
-    return FALSE;
+    return false;
 }
 
 U32 LLSDMessageBuilder::buildMessage(U8*, U32, U8)
@@ -354,7 +354,7 @@ void LLSDMessageBuilder::copyFromMessageData(const LLMsgData& data)
                 break;
 
             case MVT_BOOL:
-                addBOOL(varname, *(BOOL*)mvci.getData());
+                addBOOL(varname, *(bool*)mvci.getData());
                 break;
 
             case MVT_IP_ADDR:
@@ -400,13 +400,13 @@ const LLSD& LLSDMessageBuilder::getMessage() const
 }
 
 //virtual
-void LLSDMessageBuilder::setBuilt(BOOL b) { mbSBuilt = b; }
+void LLSDMessageBuilder::setBuilt(bool b) { mbSBuilt = b; }
 
 //virtual
-BOOL LLSDMessageBuilder::isBuilt() const {return mbSBuilt;}
+bool LLSDMessageBuilder::isBuilt() const {return mbSBuilt;}
 
 //virtual
-BOOL LLSDMessageBuilder::isClear() const {return mbSClear;}
+bool LLSDMessageBuilder::isClear() const {return mbSClear;}
 
 //virtual
 S32 LLSDMessageBuilder::getMessageSize()