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

Merge Maint A to development

1 files changed, 24 insertions, 24 deletions

diff --git a/indra/newview/llpaneloutfitedit.cpp b/indra/newview/llpaneloutfitedit.cpp
index c7ae4eb0d9..abb8178b47 100644
--- a/indra/newview/llpaneloutfitedit.cpp
+++ b/indra/newview/llpaneloutfitedit.cpp
@@ -187,8 +187,8 @@ private:
 	// Populate the menu with items like "New Skin", "New Pants", etc.
 	static void populateCreateWearableSubmenus(LLMenuGL* menu)
 	{
-		LLView* menu_clothes	= gMenuHolder->getChildView("COF.Gear.New_Clothes", FALSE);
-		LLView* menu_bp			= gMenuHolder->getChildView("COF.Gear.New_Body_Parts", FALSE);
+		LLView* menu_clothes	= gMenuHolder->getChildView("COF.Gear.New_Clothes", false);
+		LLView* menu_bp			= gMenuHolder->getChildView("COF.Gear.New_Body_Parts", false);
 		LLWearableType * wearable_type_inst = LLWearableType::getInstance();
 
 		for (U8 i = LLWearableType::WT_SHAPE; i != (U8) LLWearableType::WT_COUNT; ++i)
@@ -407,7 +407,7 @@ LLPanelOutfitEdit::LLPanelOutfitEdit()
 	mGearMenuBtn(NULL)
 {
 	mSavedFolderState = new LLSaveFolderState();
-	mSavedFolderState->setApply(FALSE);
+	mSavedFolderState->setApply(false);
 	
 
 	LLOutfitObserver& observer = LLOutfitObserver::instance();
@@ -440,7 +440,7 @@ LLPanelOutfitEdit::~LLPanelOutfitEdit()
 	}
 }
 
-BOOL LLPanelOutfitEdit::postBuild()
+bool LLPanelOutfitEdit::postBuild()
 {
 	// gInventory.isInventoryUsable() no longer needs to be tested per Richard's fix for race conditions between inventory and panels
 	
@@ -568,7 +568,7 @@ BOOL LLPanelOutfitEdit::postBuild()
 	getChild<LLButton>(SAVE_AS_BTN)->setCommitCallback(boost::bind(&LLPanelOutfitEdit::saveOutfit, this, true));
 
 	onOutfitChanging(gAgentWearables.isCOFChangeInProgress());
-	return TRUE;
+	return true;
 }
 
 // virtual
@@ -595,7 +595,7 @@ void LLPanelOutfitEdit::moveWearable(bool closer_to_body)
 
 void LLPanelOutfitEdit::toggleAddWearablesPanel()
 {
-	BOOL current_visibility = mAddWearablesPanel->getVisible();
+	bool current_visibility = mAddWearablesPanel->getVisible();
 	showAddWearablesPanel(!current_visibility);
 }
 
@@ -655,7 +655,7 @@ void LLPanelOutfitEdit::showWearablesFilter()
 	}
 	else
 	{
-		mSearchFilter->setFocus(TRUE);
+		mSearchFilter->setFocus(true);
 	}
 }
 
@@ -667,7 +667,7 @@ void LLPanelOutfitEdit::showWearablesListView()
 		updateFiltersVisibility();
 		mWearableListManager->populateIfNeeded();
 	}
-	mListViewBtn->setToggleState(TRUE);
+	mListViewBtn->setToggleState(true);
 }
 
 void LLPanelOutfitEdit::showWearablesFolderView()
@@ -677,7 +677,7 @@ void LLPanelOutfitEdit::showWearablesFolderView()
 		updateWearablesPanelVerbButtons();
 		updateFiltersVisibility();
 	}
-	mFolderViewBtn->setToggleState(TRUE);
+	mFolderViewBtn->setToggleState(true);
 }
 
 void LLPanelOutfitEdit::updateFiltersVisibility()
@@ -693,7 +693,7 @@ void LLPanelOutfitEdit::onFolderViewFilterCommitted(LLUICtrl* ctrl)
 
 	mInventoryItemsPanel->setFilterTypes(mFolderViewItemTypes[curr_filter_type].inventoryMask);
 
-	mSavedFolderState->setApply(TRUE);
+	mSavedFolderState->setApply(true);
 	mInventoryItemsPanel->getRootFolder()->applyFunctorRecursively(*mSavedFolderState);
 	
 	LLOpenFoldersWithSelection opener;
@@ -735,7 +735,7 @@ void LLPanelOutfitEdit::onSearchEdit(const std::string& string)
 		mInventoryItemsPanel->setFilterSubString(LLStringUtil::null);
 		mWearableItemsList->setFilterSubString(LLStringUtil::null, true);
 		// re-open folders that were initially open
-		mSavedFolderState->setApply(TRUE);
+		mSavedFolderState->setApply(true);
 		mInventoryItemsPanel->getRootFolder()->applyFunctorRecursively(*mSavedFolderState);
 		LLOpenFoldersWithSelection opener;
 		mInventoryItemsPanel->getRootFolder()->applyFunctorRecursively(opener);
@@ -757,7 +757,7 @@ void LLPanelOutfitEdit::onSearchEdit(const std::string& string)
 	// save current folder open state if no filter currently applied
 	if (mInventoryItemsPanel->getFilterSubString().empty())
 	{
-		mSavedFolderState->setApply(FALSE);
+		mSavedFolderState->setApply(false);
 		mInventoryItemsPanel->getRootFolder()->applyFunctorRecursively(*mSavedFolderState);
 	}
 	
@@ -997,10 +997,10 @@ void LLPanelOutfitEdit::updatePlusButton()
 					current_item->getLocalRect().mBottom);
 	
 	mAddToLookBtn->setRect(btn_rect);
-	mAddToLookBtn->setEnabled(TRUE);
+	mAddToLookBtn->setEnabled(true);
 	if (!mAddToLookBtn->getVisible())
 	{
-		mAddToLookBtn->setVisible(TRUE);
+		mAddToLookBtn->setVisible(true);
 	}
 	
 	current_item->addChild(mAddToLookBtn); */
@@ -1167,7 +1167,7 @@ void LLPanelOutfitEdit::update()
 	updateVerbs();
 }
 
-BOOL LLPanelOutfitEdit::handleDragAndDrop(S32 x, S32 y, MASK mask, BOOL drop,
+bool LLPanelOutfitEdit::handleDragAndDrop(S32 x, S32 y, MASK mask, bool drop,
 										  EDragAndDropType cargo_type,
 										  void* cargo_data,
 										  EAcceptance* accept,
@@ -1176,7 +1176,7 @@ BOOL LLPanelOutfitEdit::handleDragAndDrop(S32 x, S32 y, MASK mask, BOOL drop,
 	if (cargo_data == NULL)
 	{
 		LL_WARNS() << "cargo_data is NULL" << LL_ENDL;
-		return TRUE;
+		return true;
 	}
 
 	switch (cargo_type)
@@ -1214,14 +1214,14 @@ BOOL LLPanelOutfitEdit::handleDragAndDrop(S32 x, S32 y, MASK mask, BOOL drop,
 		}
 	}
 
-	return TRUE;
+	return true;
 }
 
 void LLPanelOutfitEdit::displayCurrentOutfit()
 {
 	if (!getVisible())
 	{
-		setVisible(TRUE);
+		setVisible(true);
 	}
 
 	updateCurrentOutfitName();
@@ -1264,8 +1264,8 @@ bool LLPanelOutfitEdit::switchPanels(LLPanel* switch_from_panel, LLPanel* switch
 {
 	if(switch_from_panel && switch_to_panel && !switch_to_panel->getVisible())
 	{
-		switch_from_panel->setVisible(FALSE);
-		switch_to_panel->setVisible(TRUE);
+		switch_from_panel->setVisible(false);
+		switch_to_panel->setVisible(true);
 		return true;
 	}
 	return false;
@@ -1383,13 +1383,13 @@ void LLPanelOutfitEdit::updateWearablesPanelVerbButtons()
 {
 	if(mWearablesListViewPanel->getVisible())
 	{
-		mFolderViewBtn->setToggleState(FALSE);
+		mFolderViewBtn->setToggleState(false);
 		mFolderViewBtn->setImageOverlay(getString("folder_view_off"), mFolderViewBtn->getImageOverlayHAlign());
 		mListViewBtn->setImageOverlay(getString("list_view_on"), mListViewBtn->getImageOverlayHAlign());
 	}
 	else if(mInventoryItemsPanel->getVisible())
 	{
-		mListViewBtn->setToggleState(FALSE);
+		mListViewBtn->setToggleState(false);
 		mListViewBtn->setImageOverlay(getString("list_view_off"), mListViewBtn->getImageOverlayHAlign());
 		mFolderViewBtn->setImageOverlay(getString("folder_view_on"), mFolderViewBtn->getImageOverlayHAlign());
 	}
@@ -1429,9 +1429,9 @@ void LLPanelOutfitEdit::saveListSelection()
 			LLFolderViewFolder* parent = item->getParentFolder();
 			if(parent)
 			{
-				parent->setOpenArrangeRecursively(TRUE, LLFolderViewFolder::RECURSE_UP);
+				parent->setOpenArrangeRecursively(true, LLFolderViewFolder::RECURSE_UP);
 			}
-			mInventoryItemsPanel->getRootFolder()->changeSelection(item, TRUE);
+			mInventoryItemsPanel->getRootFolder()->changeSelection(item, true);
 		}
 		mInventoryItemsPanel->getRootFolder()->scrollToShowSelection();
 	}