Merge remote-tracking branch 'origin/DRTVWR-600-maint-A' into gltf-dev-maint-a-merge

1 files changed, 11 insertions, 11 deletions

diff --git a/indra/newview/llinventorymodel.h b/indra/newview/llinventorymodel.h
index 69d987cabd..47fd5ce783 100644
--- a/indra/newview/llinventorymodel.h
+++ b/indra/newview/llinventorymodel.h
@@ -225,11 +225,11 @@ private:
 	// Login
 	//--------------------------------------------------------------------
 public:
-	static BOOL getIsFirstTimeInViewer2();
+	static bool getIsFirstTimeInViewer2();
     static bool  isSysFoldersReady() { return (sPendingSystemFolders == 0); }
 
 private:
-	static BOOL sFirstTimeInViewer2;
+	static bool sFirstTimeInViewer2;
 	const static S32 sCurrentInvCacheVersion; // expected inventory cache version
 
     static S32 sPendingSystemFolders;
@@ -272,8 +272,8 @@ public:
 	//    Do not store a copy of the pointers collected - use them, and 
 	//    collect them again later if you need to reference the same objects.
 	enum { 
-		EXCLUDE_TRASH = FALSE, 
-		INCLUDE_TRASH = TRUE 
+		EXCLUDE_TRASH = false, 
+		INCLUDE_TRASH = true 
 	};
 	// Simpler existence test if matches don't actually need to be collected.
 	bool hasMatchingDirectDescendent(const LLUUID& cat_id,
@@ -281,11 +281,11 @@ public:
 	void collectDescendents(const LLUUID& id,
 							cat_array_t& categories,
 							item_array_t& items,
-							BOOL include_trash);
+							bool include_trash);
 	void collectDescendentsIf(const LLUUID& id,
 							  cat_array_t& categories,
 							  item_array_t& items,
-							  BOOL include_trash,
+							  bool include_trash,
 							  LLInventoryCollectFunctor& add);
 
 	// Collect all items in inventory that are linked to item_id.
@@ -293,7 +293,7 @@ public:
 	item_array_t collectLinksTo(const LLUUID& item_id);
 
 	// Check if one object has a parent chain up to the category specified by UUID.
-	BOOL isObjectDescendentOf(const LLUUID& obj_id, const LLUUID& cat_id) const;
+	bool isObjectDescendentOf(const LLUUID& obj_id, const LLUUID& cat_id) const;
     
     enum EAncestorResult{
         ANCESTOR_OK = 0,
@@ -404,12 +404,12 @@ public:
 	// Migrated from llinventoryfunctions
 	void changeItemParent(LLViewerInventoryItem* item,
 						  const LLUUID& new_parent_id,
-						  BOOL restamp);
+						  bool restamp);
 
 	// Migrated from llinventoryfunctions
 	void changeCategoryParent(LLViewerInventoryCategory* cat,
 							  const LLUUID& new_parent_id,
-							  BOOL restamp);
+							  bool restamp);
 
     // Marks links from a "possibly" broken list for a rebuild
     // clears the list
@@ -575,7 +575,7 @@ protected:
 private:
 	// Flag set when notifyObservers is being called, to look for bugs
 	// where it's called recursively.
-	BOOL mIsNotifyObservers;
+	bool mIsNotifyObservers;
 	// Variables used to track what has changed since the last notify.
 	U32 mModifyMask;
 	changed_items_t mChangedItemIDs;
@@ -597,7 +597,7 @@ public:
 	// If the observer is destroyed, be sure to remove it.
 	void addObserver(LLInventoryObserver* observer);
 	void removeObserver(LLInventoryObserver* observer);
-	BOOL containsObserver(LLInventoryObserver* observer) const;
+	bool containsObserver(LLInventoryObserver* observer) const;
 private:
 	typedef std::set<LLInventoryObserver*> observer_list_t;
 	observer_list_t mObservers;