Merge branch 'develop' into nat/edu-channel

1 files changed, 7 insertions, 7 deletions

diff --git a/indra/llcommon/llpriqueuemap.h b/indra/llcommon/llpriqueuemap.h
index 79934d094b..2bdd39aac2 100644
--- a/indra/llcommon/llpriqueuemap.h
+++ b/indra/llcommon/llpriqueuemap.h
@@ -47,17 +47,17 @@ public:
     {
         if (mPriority > b.mPriority)
         {
-            return TRUE;
+            return true;
         }
         if (mPriority < b.mPriority)
         {
-            return FALSE;
+            return false;
         }
         if (mData > b.mData)
         {
-            return TRUE;
+            return true;
         }
-        return FALSE;
+        return false;
     }
 
     F32 mPriority;
@@ -90,18 +90,18 @@ public:
         mMap.insert(pqm_pair(LLPQMKey<DATA_TYPE>(priority, data), data));
     }
 
-    BOOL pop(DATA_TYPE *datap)
+    bool pop(DATA_TYPE *datap)
     {
         pqm_iter iter;
         iter = mMap.begin();
         if (iter == mMap.end())
         {
-            return FALSE;
+            return false;
         }
         *datap = (*(iter)).second;
         mMap.erase(iter);
 
-        return TRUE;
+        return true;
     }
 
     void reprioritize(const F32 new_priority, DATA_TYPE data)