Merge branch 'main' of https://github.com/secondlife/viewer into DRTVWR-600-maint-A

# Conflicts:
#	indra/llcommon/llapp.cpp
#	indra/llcommon/llapp.h
#	indra/llimage/llimageworker.cpp
#	indra/llui/llcontainerview.cpp
#	indra/llui/llcontainerview.h
#	indra/llui/llkeywords.cpp
#	indra/llui/lltabcontainer.cpp
#	indra/llui/lltextbase.cpp
#	indra/newview/llappviewer.cpp
#	indra/newview/llfavoritesbar.cpp
#	indra/newview/llfavoritesbar.h
#	indra/newview/llfloaterimnearbychathandler.cpp
#	indra/newview/llfloaterpreference.cpp
#	indra/newview/llhudnametag.h
#	indra/newview/llinventorypanel.cpp
#	indra/newview/llinventorypanel.h
#	indra/newview/llmeshrepository.cpp
#	indra/newview/lloutfitgallery.cpp
#	indra/newview/lloutfitslist.cpp
#	indra/newview/llpaneleditwearable.cpp
#	indra/newview/llpanelprofilepicks.cpp
#	indra/newview/llpanelvoicedevicesettings.h
#	indra/newview/llpreviewscript.cpp
#	indra/newview/llpreviewscript.h
#	indra/newview/llselectmgr.cpp
#	indra/newview/lltranslate.cpp
#	indra/newview/llviewerassetupload.cpp
#	indra/newview/llviewermessage.cpp

3 files changed, 10 insertions, 10 deletions

diff --git a/indra/llinventory/llinventory.h b/indra/llinventory/llinventory.h
index a14b7258af..929a8ef555 100644
--- a/indra/llinventory/llinventory.h
+++ b/indra/llinventory/llinventory.h
@@ -190,7 +190,7 @@ public:
 	// Assumes you have already called nextBlock().
 	virtual void packMessage(LLMessageSystem* msg) const;
 
-	// Returns TRUE if the inventory item came through the network correctly.
+	// Returns true if the inventory item came through the network correctly.
 	// Uses a simple crc check which is defeatable, but we want to detect 
 	// network mangling somehow.
 	virtual bool unpackMessage(LLMessageSystem* msg, const char* block, S32 block_num = 0);
diff --git a/indra/llinventory/llparcel.h b/indra/llinventory/llparcel.h
index ba85f5cdef..0311a5bbd5 100644
--- a/indra/llinventory/llparcel.h
+++ b/indra/llinventory/llparcel.h
@@ -343,7 +343,7 @@ public:
 	// time earlier than "now".
 	void expirePasses(S32 now);
 
-	// Add to list, suppressing duplicates.  Returns TRUE if added.
+	// Add to list, suppressing duplicates.  Returns true if added.
 	bool addToAccessList(const LLUUID& agent_id, S32 time);
 	bool addToBanList(const LLUUID& agent_id, S32 time);
 	bool removeFromAccessList(const LLUUID& agent_id);
@@ -419,7 +419,7 @@ public:
 
 	// dealing with sales and parcel conversion.
 	//
-	// the isSaleTimerExpired will trivially return FALSE if there is
+	// the isSaleTimerExpired will trivially return false if there is
 	// no sale going on. Pass in the current time in usec which will
 	// be used for comparison.
 	bool isSaleTimerExpired(const U64& time);
diff --git a/indra/llinventory/llpermissions.h b/indra/llinventory/llpermissions.h
index da3d3244db..f6a3db463d 100644
--- a/indra/llinventory/llpermissions.h
+++ b/indra/llinventory/llpermissions.h
@@ -157,7 +157,7 @@ public:
 	// return TRUE if group_id is owner.
 	bool isGroupOwned() const { return mIsGroupOwned; }
 
-	// This API returns TRUE if the object is owned at all, and FALSE
+	// This API returns true if the object is owned at all, and false
 	// otherwise. If it is owned at all, owner id is filled with
 	// either the owner id or the group id, and the is_group_owned
 	// parameter is appropriately filled. The values of owner_id and
@@ -237,13 +237,13 @@ public:
 	// checked manipulators (since that is how it is used.) If the
 	// agent is the system or (group == mGroup and group modify and
 	// owner transfer) then this function will deed the permissions,
-	// set the next owner mask, and return TRUE. Otherwise, no change
-	// is effected, and the function returns FALSE.
+	// set the next owner mask, and return true. Otherwise, no change
+	// is effected, and the function returns false.
 	bool deedToGroup(const LLUUID& agent, const LLUUID& group);
-	// Attempt to set or clear the given bitmask.  Returns TRUE if you
+	// Attempt to set or clear the given bitmask.  Returns true if you
 	// are allowed to modify the permissions.  If you attempt to turn
 	// on bits not allowed by the base bits, the function will return
-	// TRUE, but those bits will not be set.
+	// true, but those bits will not be set.
 	bool setBaseBits( const LLUUID& agent, bool set, PermissionMask bits);
 	bool setOwnerBits( const LLUUID& agent, bool set, PermissionMask bits);
 	bool setGroupBits( const LLUUID& agent, const LLUUID& group, bool set, PermissionMask bits);
@@ -293,10 +293,10 @@ public:
 	// one provided, and sets the base mask as indicated.
 	//bool setOwner(const LLUUID& agent, const LLUUID& owner, U32 new_base_mask);
 
-	// Attempt to set or clear the given bitmask.  Returns TRUE if you
+	// Attempt to set or clear the given bitmask.  Returns true if you
 	// are allowed to modify the permissions.  If you attempt to turn
 	// on bits not allowed by the base bits, the function will return
-	// TRUE, but those bits will not be set.
+	// true, but those bits will not be set.
 	//bool setGroupBits( const LLUUID& agent, bool set, PermissionMask bits);
 	//bool setEveryoneBits(const LLUUID& agent, bool set, PermissionMask bits);