1 files changed, 17 insertions, 17 deletions

diff --git a/indra/newview/llviewerinventory.cpp b/indra/newview/llviewerinventory.cpp
index eefe050d46..3082165538 100644
--- a/indra/newview/llviewerinventory.cpp
+++ b/indra/newview/llviewerinventory.cpp
@@ -298,7 +298,7 @@ public:
 			return false;
 		}
 		LLUUID inventory_id;
-		if (!inventory_id.set(params[0], FALSE))
+		if (!inventory_id.set(params[0], false))
 		{
 			return false;
 		}
@@ -496,7 +496,7 @@ void LLViewerInventoryItem::fetchFromServer(void) const
 // virtual
 bool LLViewerInventoryItem::unpackMessage(const LLSD& item)
 {
-	BOOL rv = LLInventoryItem::fromLLSD(item);
+	bool rv = LLInventoryItem::fromLLSD(item);
 
 	LLLocalizedInventoryItemsDictionary::getInstance()->localizeInventoryObjectName(mName);
 
@@ -507,7 +507,7 @@ bool LLViewerInventoryItem::unpackMessage(const LLSD& item)
 // virtual
 bool LLViewerInventoryItem::unpackMessage(LLMessageSystem* msg, const char* block, S32 block_num)
 {
-	BOOL rv = LLInventoryItem::unpackMessage(msg, block, block_num);
+	bool rv = LLInventoryItem::unpackMessage(msg, block, block_num);
 
 	LLLocalizedInventoryItemsDictionary::getInstance()->localizeInventoryObjectName(mName);
 
@@ -802,7 +802,7 @@ bool LLViewerInventoryCategory::acceptItem(LLInventoryItem* inv_item)
 void LLViewerInventoryCategory::determineFolderType()
 {
 	/* Do NOT uncomment this code.  This is for future 2.1 support of ensembles.
-	llassert(FALSE);
+	llassert(false);
 	LLFolderType::EType original_type = getPreferredType();
 	if (LLFolderType::lookupIsProtectedType(original_type))
 		return;
@@ -811,7 +811,7 @@ void LLViewerInventoryCategory::determineFolderType()
 	U64 folder_invalid = 0;
 	LLInventoryModel::cat_array_t category_array;
 	LLInventoryModel::item_array_t item_array;
-	gInventory.collectDescendents(getUUID(),category_array,item_array,FALSE);
+	gInventory.collectDescendents(getUUID(),category_array,item_array,false);
 
 	// For ensembles
 	if (category_array.empty())
@@ -846,7 +846,7 @@ void LLViewerInventoryCategory::determineFolderType()
 	{
 		changeType(LLFolderType::FT_NONE);
 	}
-	llassert(FALSE);
+	llassert(false);
 	*/
 }
 
@@ -1034,7 +1034,7 @@ void create_gesture_cb(const LLUUID& inv_item)
 
 			LLPreviewGesture* preview = LLPreviewGesture::show(inv_item,  LLUUID::null);
 			// Force to be entirely onscreen.
-			gFloaterView->adjustToFitScreen(preview, FALSE);
+			gFloaterView->adjustToFitScreen(preview, false);
 		}
 	}
 }
@@ -1370,7 +1370,7 @@ void move_inventory_item(
 	msg->nextBlockFast(_PREHASH_AgentData);
 	msg->addUUIDFast(_PREHASH_AgentID, agent_id);
 	msg->addUUIDFast(_PREHASH_SessionID, session_id);
-	msg->addBOOLFast(_PREHASH_Stamp, FALSE);
+	msg->addBOOLFast(_PREHASH_Stamp, false);
 	msg->nextBlockFast(_PREHASH_InventoryData);
 	msg->addUUIDFast(_PREHASH_ItemID, item_id);
 	msg->addUUIDFast(_PREHASH_FolderID, parent_id);
@@ -1589,7 +1589,7 @@ void purge_descendents_of(const LLUUID& id, LLPointer<LLInventoryCallback> cb)
 			// Remove items from clipboard or it will remain active even if there is nothing to paste/copy
 			LLInventoryModel::cat_array_t categories;
 			LLInventoryModel::item_array_t items;
-			gInventory.collectDescendents(id, categories, items, TRUE);
+			gInventory.collectDescendents(id, categories, items, true);
 
 			for (LLInventoryModel::cat_array_t::const_iterator it = categories.begin(); it != categories.end(); ++it)
 			{
@@ -1832,7 +1832,7 @@ void menu_create_inventory_item(LLInventoryPanel* panel, LLUUID dest_id, const L
                 LLInventoryPanel* panel = static_cast<LLInventoryPanel*>(handle.get());
                 if (panel)
                 {
-                    panel->setSelectionByID(new_category_id, TRUE);
+                    panel->setSelectionByID(new_category_id, true);
                 }
                 LL_DEBUGS(LOG_INV) << "Done creating inventory: " << new_category_id << LL_ENDL;
             };
@@ -1929,7 +1929,7 @@ void menu_create_inventory_item(LLInventoryPanel* panel, LLUUID dest_id, const L
     }
     if(panel)
     {
-        panel->getRootFolder()->setNeedsAutoRename(TRUE);
+        panel->getRootFolder()->setNeedsAutoRename(true);
     }
 }
 
@@ -2149,7 +2149,7 @@ bool LLViewerInventoryItem::extractSortFieldAndDisplayName(const std::string& na
 	const char separator = getSeparator();
 	const string::size_type separatorPos = name.find(separator, 0);
 
-	BOOL result = false;
+	bool result = false;
 
 	if (separatorPos < string::npos)
 	{
@@ -2235,9 +2235,9 @@ PermissionMask LLViewerInventoryItem::getPermissionMask() const
 {
 	const LLPermissions& permissions = getPermissions();
 
-	BOOL copy = permissions.allowCopyBy(gAgent.getID());
-	BOOL mod = permissions.allowModifyBy(gAgent.getID());
-	BOOL xfer = permissions.allowOperationBy(PERM_TRANSFER, gAgent.getID());
+	bool copy = permissions.allowCopyBy(gAgent.getID());
+	bool mod = permissions.allowModifyBy(gAgent.getID());
+	bool xfer = permissions.allowOperationBy(PERM_TRANSFER, gAgent.getID());
 	PermissionMask perm_mask = 0;
 	if (copy) perm_mask |= PERM_COPY;
 	if (mod)  perm_mask |= PERM_MODIFY;
@@ -2300,11 +2300,11 @@ LLUUID find_possible_item_for_regeneration(const LLViewerInventoryItem *target_i
 
 // This currently dosen't work, because the sim does not allow us 
 // to change an item's assetID.
-BOOL LLViewerInventoryItem::regenerateLink()
+bool LLViewerInventoryItem::regenerateLink()
 {
 	const LLUUID target_item_id = find_possible_item_for_regeneration(this);
 	if (target_item_id.isNull())
-		return FALSE;
+		return false;
 	LLViewerInventoryCategory::cat_array_t cats;
 	LLViewerInventoryItem::item_array_t items;
 	LLAssetIDMatches asset_id_matches(getAssetUUID());