1 files changed, 19 insertions, 19 deletions

diff --git a/indra/llui/lltoolbar.cpp b/indra/llui/lltoolbar.cpp
index 7925c1048d..580d91fb4b 100644
--- a/indra/llui/lltoolbar.cpp
+++ b/indra/llui/lltoolbar.cpp
@@ -399,7 +399,7 @@ bool LLToolBar::flashCommand(const LLCommandId& commandId, bool flash, bool forc
 		if (it != mButtonMap.end())
 		{
 			command_button = it->second;
-			command_button->setFlashing((BOOL)(flash),(BOOL)(force_flashing));
+			command_button->setFlashing((bool)(flash),(bool)(force_flashing));
 		}
 	}
 
@@ -444,9 +444,9 @@ bool LLToolBar::handleRightMouseDown(S32 x, S32 y, MASK mask)
 	return handle_it_here;
 }
 
-BOOL LLToolBar::isSettingChecked(const LLSD& userdata)
+bool LLToolBar::isSettingChecked(const LLSD& userdata)
 {
-	BOOL retval = FALSE;
+	bool retval = false;
 
 	const std::string setting_name = userdata.asString();
 
@@ -785,8 +785,8 @@ void LLToolBar::updateLayoutAsNeeded()
 
 	if (!mButtons.empty())
 	{
-		mButtonPanel->setVisible(TRUE);
-		mButtonPanel->setMouseOpaque(TRUE);
+		mButtonPanel->setVisible(true);
+		mButtonPanel->setMouseOpaque(true);
 	}
 
 	// don't clear flag until after we've resized ourselves, to avoid laying out every frame
@@ -798,13 +798,13 @@ void LLToolBar::draw()
 {
 	if (mButtons.empty())
 	{
-		mButtonPanel->setVisible(FALSE);
-		mButtonPanel->setMouseOpaque(FALSE);
+		mButtonPanel->setVisible(false);
+		mButtonPanel->setMouseOpaque(false);
 	}
 	else
 	{
-		mButtonPanel->setVisible(TRUE);
-		mButtonPanel->setMouseOpaque(TRUE);
+		mButtonPanel->setVisible(true);
+		mButtonPanel->setMouseOpaque(true);
 	}
 
 	// Update enable/disable state and highlight state for editable toolbars
@@ -842,7 +842,7 @@ void LLToolBar::draw()
 	}
 
 	LLIconCtrl* caret = mCaretIcon;
-	caret->setVisible(FALSE);
+	caret->setVisible(false);
 	if (mDragAndDropTarget && !mButtonCommands.empty())
 	{
 		LLRect caret_rect = caret->getRect();
@@ -860,15 +860,15 @@ void LLToolBar::draw()
 								  mDragx+mDragGirth,
 								  mDragy-caret_rect.getHeight()/2));
 		}
-		caret->setVisible(TRUE);
+		caret->setVisible(true);
 	}
 		
 	LLUICtrl::draw();
-	caret->setVisible(FALSE);
+	caret->setVisible(false);
 	mDragAndDropTarget = false;
 }
 
-void LLToolBar::reshape(S32 width, S32 height, BOOL called_from_parent)
+void LLToolBar::reshape(S32 width, S32 height, bool called_from_parent)
 {
 	LLUICtrl::reshape(width, height, called_from_parent);
 	mNeedsLayout = true;
@@ -1043,14 +1043,14 @@ boost::signals2::connection LLToolBar::setButtonRemoveCallback(const button_sign
 	return connectSignal(mButtonRemoveSignal, cb);
 }
 
-BOOL LLToolBar::handleDragAndDrop(S32 x, S32 y, MASK mask, BOOL drop,
+bool LLToolBar::handleDragAndDrop(S32 x, S32 y, MASK mask, bool drop,
 										EDragAndDropType cargo_type,
 										void* cargo_data,
 										EAcceptance* accept,
 										std::string& tooltip_msg)
 {
 	// If we have a drop callback, that means that we can handle the drop
-	BOOL handled = (mHandleDropCallback ? TRUE : FALSE);
+	bool handled = (mHandleDropCallback ? true : false);
 	
 	// if drop is set, it's time to call the callback to get the operation done
 	if (handled && drop)
@@ -1084,7 +1084,7 @@ BOOL LLToolBar::handleDragAndDrop(S32 x, S32 y, MASK mask, BOOL drop,
 		}
 		else
 		{
-			handled = FALSE;
+			handled = false;
 		}
 	}
 	
@@ -1165,7 +1165,7 @@ void LLToolBarButton::onMouseEnter(S32 x, S32 y, MASK mask)
 	// Always highlight toolbar buttons, even if they are disabled
 	if (!gFocusMgr.getMouseCapture() || gFocusMgr.getMouseCapture() == this)
 	{
-		mNeedsHighlight = TRUE;
+		mNeedsHighlight = true;
 	}
 
 	LLToolBar* parent_toolbar = getParentByType<LLToolBar>();
@@ -1201,12 +1201,12 @@ void LLToolBarButton::onCommit()
 	}
 }
 
-void LLToolBarButton::reshape(S32 width, S32 height, BOOL called_from_parent)
+void LLToolBarButton::reshape(S32 width, S32 height, bool called_from_parent)
 {
 	LLButton::reshape(mWidthRange.clamp(width), height, called_from_parent);
 }
 
-void LLToolBarButton::setEnabled(BOOL enabled)
+void LLToolBarButton::setEnabled(bool enabled)
 {
 	if (enabled)
 	{