Merge branch 'develop' into nat/edu-channel

1 files changed, 15 insertions, 15 deletions

diff --git a/indra/llmessage/lltransfermanager.cpp b/indra/llmessage/lltransfermanager.cpp
index 7f6ff3b025..72d623ea42 100644
--- a/indra/llmessage/lltransfermanager.cpp
+++ b/indra/llmessage/lltransfermanager.cpp
@@ -49,7 +49,7 @@ LLTransferSource::stype_scfunc_map LLTransferSource::sSourceCreateMap;
 //
 
 LLTransferManager::LLTransferManager() :
-    mValid(FALSE)
+    mValid(false)
 {
     S32 i;
     for (i = 0; i < LLTTT_NUM_TYPES; i++)
@@ -78,7 +78,7 @@ void LLTransferManager::init()
     {
         LL_ERRS() << "Double initializing LLTransferManager!" << LL_ENDL;
     }
-    mValid = TRUE;
+    mValid = true;
 
     // Register message system handlers
     gMessageSystem->setHandlerFunc("TransferRequest", processTransferRequest, NULL);
@@ -90,7 +90,7 @@ void LLTransferManager::init()
 
 void LLTransferManager::cleanup()
 {
-    mValid = FALSE;
+    mValid = false;
 
     host_tc_map::iterator iter;
     for (iter = mTransferConnections.begin(); iter != mTransferConnections.end(); iter++)
@@ -254,7 +254,7 @@ void LLTransferManager::processTransferRequest(LLMessageSystem *msgp, void **)
     msgp->getBinaryData("TransferInfo", "Params", tmp, size);
 
     LLDataPackerBinaryBuffer dpb(tmp, MAX_PARAMS_SIZE);
-    BOOL unpack_ok = tsp->unpackParams(dpb);
+    bool unpack_ok = tsp->unpackParams(dpb);
     if (!unpack_ok)
     {
         // This should only happen if the data is corrupt or
@@ -342,7 +342,7 @@ void LLTransferManager::processTransferInfo(LLMessageSystem *msgp, void **)
 
     //LL_INFOS() << "Receiving " << transfer_id << ", size " << size << " bytes" << LL_ENDL;
     ttp->setSize(size);
-    ttp->setGotInfo(TRUE);
+    ttp->setGotInfo(true);
 
     // OK, at this point we to handle any delayed transfer packets (which could happen
     // if this packet was lost)
@@ -505,7 +505,7 @@ void LLTransferManager::processTransferPacket(LLMessageSystem *msgp, void **)
     // NOTE: THERE IS A CUT AND PASTE OF THIS CODE IN THE TRANSFERINFO HANDLER
     // SO WE CAN PLAY BACK DELAYED PACKETS THERE!!!!!!!!!!!!!!!!!!!!!!!!!
     //
-    BOOL done = FALSE;
+    bool done = false;
     while (!done)
     {
         LLTSCode ret_code = ttp->dataCallback(packet_id, tmp_data, size);
@@ -557,7 +557,7 @@ void LLTransferManager::processTransferPacket(LLMessageSystem *msgp, void **)
         else
         {
             // No matching delayed packet, abort it.
-            done = TRUE;
+            done = true;
         }
     }
 }
@@ -780,7 +780,7 @@ void LLTransferSourceChannel::updateTransfers()
 
     LLPriQueueMap<LLTransferSource *>::pqm_iter iter, next;
 
-    BOOL done = FALSE;
+    bool done = false;
     for (iter = mTransferSources.mMap.begin(); (iter != mTransferSources.mMap.end()) && !done;)
     {
         //LL_INFOS() << "LLTransferSourceChannel::updateTransfers()" << LL_ENDL;
@@ -791,7 +791,7 @@ void LLTransferSourceChannel::updateTransfers()
         LLTransferSource *tsp = iter->second;
         U8 *datap = NULL;
         S32 data_size = 0;
-        BOOL delete_data = FALSE;
+        bool delete_data = false;
         S32 packet_id = 0;
         S32 sent_bytes = 0;
         LLTSCode status = LLTS_OK;
@@ -822,7 +822,7 @@ void LLTransferSourceChannel::updateTransfers()
         gMessageSystem->addS32("Status", status);
         gMessageSystem->addBinaryData("Data", datap, data_size);
         sent_bytes = gMessageSystem->getCurrentSendTotal();
-        gMessageSystem->sendReliable(getHost(), LL_DEFAULT_RELIABLE_RETRIES, TRUE, F32Seconds(0.f),
+        gMessageSystem->sendReliable(getHost(), LL_DEFAULT_RELIABLE_RETRIES, true, F32Seconds(0.f),
                                      LLTransferManager::reliablePacketCallback, (void**)cb_uuid);
 
         // Do bookkeeping for the throttle
@@ -1207,7 +1207,7 @@ LLTransferTarget::LLTransferTarget(
     mSourceType(source_type),
     mID(transfer_id),
     mChannelp(NULL),
-    mGotInfo(FALSE),
+    mGotInfo(false),
     mSize(0),
     mLastPacketID(-1)
 {
@@ -1335,7 +1335,7 @@ void LLTransferSourceParamsInvItem::packParams(LLDataPacker &dp) const
 }
 
 
-BOOL LLTransferSourceParamsInvItem::unpackParams(LLDataPacker &dp)
+bool LLTransferSourceParamsInvItem::unpackParams(LLDataPacker &dp)
 {
     S32 tmp_at;
 
@@ -1349,7 +1349,7 @@ BOOL LLTransferSourceParamsInvItem::unpackParams(LLDataPacker &dp)
 
     mAssetType = (LLAssetType::EType)tmp_at;
 
-    return TRUE;
+    return true;
 }
 
 LLTransferSourceParamsEstate::LLTransferSourceParamsEstate() :
@@ -1387,7 +1387,7 @@ void LLTransferSourceParamsEstate::packParams(LLDataPacker &dp) const
 }
 
 
-BOOL LLTransferSourceParamsEstate::unpackParams(LLDataPacker &dp)
+bool LLTransferSourceParamsEstate::unpackParams(LLDataPacker &dp)
 {
     S32 tmp_et;
 
@@ -1397,5 +1397,5 @@ BOOL LLTransferSourceParamsEstate::unpackParams(LLDataPacker &dp)
 
     mEstateAssetType = (EstateAssetType)tmp_et;
 
-    return TRUE;
+    return true;
 }