Merge pull request #2856 from secondlife/marchcat/c-develop

Develop → Maint C sync

1 files changed, 6 insertions, 7 deletions

diff --git a/indra/llmessage/llmail.cpp b/indra/llmessage/llmail.cpp
index 4e5cf8ed48..b842aeda62 100644
--- a/indra/llmessage/llmail.cpp
+++ b/indra/llmessage/llmail.cpp
@@ -28,7 +28,6 @@
 
 #include "llmail.h"
 
-// APR on Windows needs full windows headers
 #include "llwin32headers.h"
 #include <string>
 #include <sstream>
@@ -99,10 +98,10 @@ void disconnect_smtp()
     }
 }
 
-// Returns TRUE on success.
+// Returns true on success.
 // message should NOT be SMTP escaped.
 // static
-BOOL LLMail::send(
+bool LLMail::send(
     const char* from_name,
     const char* from_address,
     const char* to_name,
@@ -120,7 +119,7 @@ BOOL LLMail::send(
         headers);
     if(header.empty())
     {
-        return FALSE;
+        return false;
     }
 
     std::string message_str;
@@ -129,8 +128,8 @@ BOOL LLMail::send(
         message_str = message;
     }
     bool rv = send(header, message_str, to_address, from_address);
-    if(rv) return TRUE;
-    return FALSE;
+    if(rv) return true;
+    return false;
 }
 
 // static
@@ -273,7 +272,7 @@ bool LLMail::send(
     std::string good_string = "\n..\n";
     while (1)
     {
-        int index = message.find(bad_string);
+        auto index = message.find(bad_string);
         if (index == std::string::npos) break;
         message.replace(index, bad_string.size(), good_string);
     }