Merge pull request #1413 from secondlife/gltf-dev-maint-a-merge

Merge Maint A to development

1 files changed, 7 insertions, 7 deletions

diff --git a/indra/llcommon/llcallbacklist.cpp b/indra/llcommon/llcallbacklist.cpp
index 9f23ce5317..a2800d42ce 100644
--- a/indra/llcommon/llcallbacklist.cpp
+++ b/indra/llcommon/llcallbacklist.cpp
@@ -70,11 +70,11 @@ bool LLCallbackList::containsFunction( callback_t func, void *data)
 	callback_list_t::iterator iter = find(func,data);
 	if (iter != mCallbackList.end())
 	{
-		return TRUE;
+		return true;
 	}
 	else
 	{
-		return FALSE;
+		return false;
 	}
 }
 
@@ -85,11 +85,11 @@ bool LLCallbackList::deleteFunction( callback_t func, void *data)
 	if (iter != mCallbackList.end())
 	{
 		mCallbackList.erase(iter);
-		return TRUE;
+		return true;
 	}
 	else
 	{
-		return FALSE;
+		return false;
 	}
 }
 
@@ -191,10 +191,10 @@ public:
 	}
 
 private:
-	BOOL tick()
+	bool tick()
 	{
 		mCallable();
-		return TRUE;
+		return true;
 	}
 
 	nullary_func_t mCallable;
@@ -215,7 +215,7 @@ public:
 	{
 	}
 private:
-	BOOL tick()
+	bool tick()
 	{
 		return mCallable();
 	}