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

1 files changed, 3 insertions, 3 deletions

diff --git a/indra/llmessage/llhost.cpp b/indra/llmessage/llhost.cpp
index fe0b594d39..ace316512f 100644
--- a/indra/llmessage/llhost.cpp
+++ b/indra/llmessage/llhost.cpp
@@ -103,7 +103,7 @@ std::string LLHost::getHostName() const
     }
 }
 
-BOOL LLHost::setHostByName(const std::string& hostname)
+bool LLHost::setHostByName(const std::string& hostname)
 {
     hostent *he;
     std::string local_name(hostname);
@@ -123,7 +123,7 @@ BOOL LLHost::setHostByName(const std::string& hostname)
     if (he)
     {
         mIP = *(U32 *)he->h_addr_list[0];
-        return TRUE;
+        return true;
     }
     else
     {
@@ -147,7 +147,7 @@ BOOL LLHost::setHostByName(const std::string& hostname)
                 LL_WARNS() << "LLHost::setAddress(): unknown error - " << error_number << LL_ENDL;
                 break;
         }
-        return FALSE;
+        return false;
     }
 }