Merge remote-tracking branch 'secondlife/release/2024.06-atlasaurus' into 2024.06-atlasaurus

1 files changed, 16 insertions, 15 deletions

diff --git a/indra/llmessage/lltemplatemessagereader.cpp b/indra/llmessage/lltemplatemessagereader.cpp
index c24c850a86..1432fd1efd 100644
--- a/indra/llmessage/lltemplatemessagereader.cpp
+++ b/indra/llmessage/lltemplatemessagereader.cpp
@@ -287,11 +287,11 @@ void LLTemplateMessageReader::getU8(const char *block, const char *var,
 }
 
 void LLTemplateMessageReader::getBOOL(const char *block, const char *var,
-                                          BOOL &b, S32 blocknum )
+                                          bool &b, S32 blocknum )
 {
     U8 value(0);
     getData(block, var, &value, sizeof(U8), blocknum);
-    b = (BOOL) value;
+    b = (bool)value;
 }
 
 void LLTemplateMessageReader::getS16(const char *block, const char *var,
@@ -446,7 +446,7 @@ S32 LLTemplateMessageReader::getMessageSize() const
 }
 
 // Returns template for the message contained in buffer
-BOOL LLTemplateMessageReader::decodeTemplate(
+bool LLTemplateMessageReader::decodeTemplate(
         const U8* buffer, S32 buffer_size,  // inputs
         LLMessageTemplate** msg_template, bool custom ) // outputs
 {
@@ -456,7 +456,7 @@ BOOL LLTemplateMessageReader::decodeTemplate(
     if (buffer_size <= 0)
     {
         LL_WARNS() << "No message waiting for decode!" << LL_ENDL;
-        return(FALSE);
+        return(false);
     }
 
     U32 num = 0;
@@ -493,7 +493,7 @@ BOOL LLTemplateMessageReader::decodeTemplate(
         if (!custom)
         LL_WARNS() << "Packet with unusable length received (too short): "
                 << buffer_size << LL_ENDL;
-        return(FALSE);
+        return(false);
     }
 
     LLMessageTemplate* temp = get_ptr_in_map(mMessageNumbers,num);
@@ -508,10 +508,11 @@ BOOL LLTemplateMessageReader::decodeTemplate(
         LL_WARNS_ONCE() << "Message #" << std::hex << num << std::dec
                         << " received but not registered!" << LL_ENDL;
         }
-        return(FALSE);
+        //gMessageSystem->callExceptionFunc(MX_UNREGISTERED_MESSAGE);
+        return(false);
     }
 
-    return(TRUE);
+    return(true);
 }
 
 void LLTemplateMessageReader::logRanOffEndOfPacket( const LLHost& host, const S32 where, const S32 wanted )
@@ -536,7 +537,7 @@ void LLTemplateMessageReader::logRanOffEndOfPacket( const LLHost& host, const S3
 static LLTrace::BlockTimerStatHandle FTM_PROCESS_MESSAGES("Process Messages");
 
 // decode a given message
-BOOL LLTemplateMessageReader::decodeData(const U8* buffer, const LLHost& sender, bool custom )
+bool LLTemplateMessageReader::decodeData(const U8* buffer, const LLHost& sender, bool custom )
 {
     LL_RECORD_BLOCK_TIME(FTM_PROCESS_MESSAGES);
 
@@ -598,7 +599,7 @@ BOOL LLTemplateMessageReader::decodeData(const U8* buffer, const LLHost& sender,
         {
             if (!custom)
             LL_ERRS() << "Unknown block type" << LL_ENDL;
-            return FALSE;
+            return false;
         }
 
         LLMsgBlkData* cur_data_block = NULL;
@@ -706,7 +707,7 @@ BOOL LLTemplateMessageReader::decodeData(const U8* buffer, const LLHost& sender,
         && !mCurrentRMessageTemplate->mMemberBlocks.empty())
     {
         LL_WARNS() << "Empty message '" << mCurrentRMessageTemplate->mName << "' (no blocks)" << LL_ENDL;
-        return FALSE;
+        return false;
     }
 
     if (!custom)
@@ -756,10 +757,10 @@ BOOL LLTemplateMessageReader::decodeData(const U8* buffer, const LLHost& sender,
             }
         }
     }
-    return TRUE;
+    return true;
 }
 
-BOOL LLTemplateMessageReader::validateMessage(const U8* buffer,
+bool LLTemplateMessageReader::validateMessage(const U8* buffer,
                                               S32 buffer_size,
                                               const LLHost& sender,
                                               bool trusted,
@@ -783,7 +784,7 @@ BOOL LLTemplateMessageReader::validateMessage(const U8* buffer,
             << " from "
             << ((trusted) ? "trusted " : "untrusted ")
             << sender << LL_ENDL;
-        valid = FALSE;
+        valid = false;
     }
 
     if(valid && isUdpBanned())
@@ -791,12 +792,12 @@ BOOL LLTemplateMessageReader::validateMessage(const U8* buffer,
         LL_WARNS() << "Received UDP black listed message "
                 <<  getMessageName()
                 << " from " << sender << LL_ENDL;
-        valid = FALSE;
+        valid = false;
     }
     return valid;
 }
 
-BOOL LLTemplateMessageReader::readMessage(const U8* buffer,
+bool LLTemplateMessageReader::readMessage(const U8* buffer,
                                           const LLHost& sender)
 {
     return decodeData(buffer, sender);