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

12 files changed, 24 insertions, 33 deletions

diff --git a/indra/llmessage/llcachename.h b/indra/llmessage/llcachename.h
index d4c18d4d4c..8091248151 100644
--- a/indra/llmessage/llcachename.h
+++ b/indra/llmessage/llcachename.h
@@ -70,7 +70,7 @@ public:
 
 	// If available, copies name ("bobsmith123" or "James Linden") into string
 	// If not available, copies the string "waiting".
-	// Returns TRUE iff available.
+	// Returns true if available.
 	bool getFullName(const LLUUID& id, std::string& full_name);
 
 	// Reverse lookup of UUID from name
@@ -99,7 +99,7 @@ public:
 	// If available, this method copies the group name into the string
 	// provided. The caller must allocate at least
 	// DB_GROUP_NAME_BUF_SIZE characters. If not available, this
-	// method copies the string "waiting". Returns TRUE iff available.
+	// method copies the string "waiting". Returns true if available.
 	bool getGroupName(const LLUUID& id, std::string& group);
 
 	// Call the callback with the group or avatar name.
diff --git a/indra/llmessage/llcipher.h b/indra/llmessage/llcipher.h
index 76e3a7a5a3..b3f142c001 100644
--- a/indra/llmessage/llcipher.h
+++ b/indra/llmessage/llcipher.h
@@ -38,7 +38,7 @@ class LLCipher
 public:
 	virtual ~LLCipher() {}
 
-	// encrypt src and place result into dst. returns TRUE if
+	// encrypt src and place result into dst. returns true if
 	// Returns number of bytes written into dst, or 0 on error.
 	virtual U32 encrypt(const U8* src, U32 src_len, U8* dst, U32 dst_len) = 0;
 
diff --git a/indra/llmessage/llmail.cpp b/indra/llmessage/llmail.cpp
index b22cd8cccd..6414c2c016 100644
--- a/indra/llmessage/llmail.cpp
+++ b/indra/llmessage/llmail.cpp
@@ -99,7 +99,7 @@ void disconnect_smtp()
 	}
 }
 
-// Returns TRUE on success.
+// Returns true on success.
 // message should NOT be SMTP escaped.
 // static
 bool LLMail::send(
diff --git a/indra/llmessage/lltemplatemessagebuilder.cpp b/indra/llmessage/lltemplatemessagebuilder.cpp
index 4188feb318..62c53dbe55 100644
--- a/indra/llmessage/lltemplatemessagebuilder.cpp
+++ b/indra/llmessage/lltemplatemessagebuilder.cpp
@@ -262,7 +262,7 @@ bool LLTemplateMessageBuilder::removeLastBlock()
 
 				if (num_blocks <= 1)
 				{
-					// we just blew away the last one, so return FALSE
+					// we just blew away the last one, so return false
 					LL_WARNS() << "not blowing away the only block of message "
 							<< mCurrentSMessageName
 							<< ". Block: " << block_name
diff --git a/indra/llmessage/llthrottle.h b/indra/llmessage/llthrottle.h
index 9b829e788a..4eb800de06 100644
--- a/indra/llmessage/llthrottle.h
+++ b/indra/llmessage/llthrottle.h
@@ -41,8 +41,8 @@ public:
 	~LLThrottle() { }
 
 	void setRate(const F32 rate);
-	bool checkOverflow(const F32 amount); // I'm about to add an amount, TRUE if would overflow throttle
-	bool throttleOverflow(const F32 amount); // I just sent amount, TRUE if that overflowed the throttle
+	bool checkOverflow(const F32 amount); // I'm about to add an amount, true if would overflow throttle
+	bool throttleOverflow(const F32 amount); // I just sent amount, true if that overflowed the throttle
 
 	F32 getAvailable();	// Return the available bits
 	F32 getRate() const				{ return mRate; }
@@ -73,10 +73,10 @@ public:
 	~LLThrottleGroup() { }
 
 	void	resetDynamicAdjust();
-	bool	checkOverflow(S32 throttle_cat, F32 bits);		// I'm about to send bits, TRUE if would overflow channel
-	bool	throttleOverflow(S32 throttle_cat, F32 bits);	// I just sent bits, TRUE if that overflowed the channel
-	bool	dynamicAdjust();		// Shift bandwidth from idle channels to busy channels, TRUE if adjustment occurred
-	bool	setNominalBPS(F32* throttle_vec);				// TRUE if any value was different, resets adjustment system if was different
+	bool	checkOverflow(S32 throttle_cat, F32 bits);		// I'm about to send bits, true if would overflow channel
+	bool	throttleOverflow(S32 throttle_cat, F32 bits);	// I just sent bits, true if that overflowed the channel
+	bool	dynamicAdjust();		// Shift bandwidth from idle channels to busy channels, true if adjustment occurred
+	bool	setNominalBPS(F32* throttle_vec);				// true if any value was different, resets adjustment system if was different
 
 	S32		getAvailable(S32 throttle_cat);					// Return bits available in the channel
 
diff --git a/indra/llmessage/llxfer.cpp b/indra/llmessage/llxfer.cpp
index 854f5664f0..58e85b49b4 100644
--- a/indra/llmessage/llxfer.cpp
+++ b/indra/llmessage/llxfer.cpp
@@ -386,12 +386,3 @@ std::ostream& operator<< (std::ostream& os, LLXfer &hh)
 	os << hh.getFileName() ;
 	return os;
 }
-
-
-
-
-
-
-
-
-
diff --git a/indra/llmessage/machine.h b/indra/llmessage/machine.h
index 6505a88639..831503741c 100644
--- a/indra/llmessage/machine.h
+++ b/indra/llmessage/machine.h
@@ -65,7 +65,7 @@ public:
 	// The control port is the listen port of the parent process that
 	// launched this machine. 0 means none or not known.
 	const S32		&getControlPort() 	const { return mControlPort; }
-	bool			isValid()			const { return (mHost.getPort() != 0); }	// TRUE if corresponds to functioning machine
+	bool			isValid()			const { return (mHost.getPort() != 0); }	// true if corresponds to functioning machine
 
 	// set functions
 	void			setMachineType(EMachineType machine_type)	{ mMachineType = machine_type; }
diff --git a/indra/llmessage/message.cpp b/indra/llmessage/message.cpp
index 91a1250857..0d7810a659 100644
--- a/indra/llmessage/message.cpp
+++ b/indra/llmessage/message.cpp
@@ -481,7 +481,7 @@ LLCircuitData* LLMessageSystem::findCircuit(const LLHost& host,
 	return cdp;
 }
 
-// Returns TRUE if a valid, on-circuit message has been received.
+// Returns true if a valid, on-circuit message has been received.
 // Requiring a non-const LockMessageChecker reference ensures that
 // mMessageReader has been set to mTemplateMessageReader.
 bool LLMessageSystem::checkMessages(LockMessageChecker&, S64 frame_count )
@@ -959,7 +959,7 @@ bool LLMessageSystem::isSendFullFast(const char* blockname)
 }
 
 
-// blow away the last block of a message, return FALSE if that leaves no blocks or there wasn't a block to remove
+// blow away the last block of a message, return false if that leaves no blocks or there wasn't a block to remove
 // TODO: Babbage: Remove this horror.
 bool LLMessageSystem::removeLastBlock()
 {
@@ -1513,8 +1513,8 @@ bool    LLMessageSystem::getCircuitTrust(const LLHost &host)
 	return false;
 }
 
-// Activate a circuit, and set its trust level (TRUE if trusted,
-// FALSE if not).
+// Activate a circuit, and set its trust level (true if trusted,
+// false if not).
 void LLMessageSystem::enableCircuit(const LLHost &host, bool trusted)
 {
 	LLCircuitData *cdp = mCircuitInfo.findCircuit(host);
diff --git a/indra/llmessage/message.h b/indra/llmessage/message.h
index c167d7ff57..65c1e07a68 100644
--- a/indra/llmessage/message.h
+++ b/indra/llmessage/message.h
@@ -295,7 +295,7 @@ class LLMessageSystem : public LLMessageSenderInterface
 	LLPacketRing				mPacketRing;
 	LLReliablePacketParams		mReliablePacketParams;
 
-	// Set this flag to TRUE when you want *very* verbose logs.
+	// Set this flag to true when you want *very* verbose logs.
 	bool						mVerboseLog;
 
 	F32                         mMessageFileVersionNumber;
@@ -388,8 +388,8 @@ public:
 
 	// Set a callback function for a message system exception.
 	void setExceptionFunc(EMessageException exception, msg_exception_callback func, void* data = NULL);
-	// Call the specified exception func, and return TRUE if a
-	// function was found and called. Otherwise return FALSE.
+	// Call the specified exception func, and return true if a
+	// function was found and called. Otherwise return false.
 	bool callExceptionFunc(EMessageException exception);
 
 	// Set a function that will be called once per packet processed with the 
@@ -885,7 +885,7 @@ private:
 	LLTimer mMessageSystemTimer;
 
 	static F32 mTimeDecodesSpamThreshold;  // If mTimeDecodes is on, all this many seconds for each msg decode before spamming
-	static bool mTimeDecodes;  // Measure time for all message decodes if TRUE;
+	static bool mTimeDecodes;  // Measure time for all message decodes if true;
 
 	msg_timing_callback mTimingCallback;
 	void* mTimingCallbackData;
diff --git a/indra/llmessage/net.cpp b/indra/llmessage/net.cpp
index e43751f23e..443303e45a 100644
--- a/indra/llmessage/net.cpp
+++ b/indra/llmessage/net.cpp
@@ -338,7 +338,7 @@ S32 receive_packet(int hSocket, char * receiveBuffer)
 	return nRet;
 }
 
-// Returns TRUE on success.
+// Returns true on success.
 bool send_packet(int hSocket, const char *sendBuffer, int size, U32 recipient, int nPort)
 {
 	//  Sends a packet to the address set in initNet
diff --git a/indra/llmessage/net.h b/indra/llmessage/net.h
index 3d45899a56..a873026fa4 100644
--- a/indra/llmessage/net.h
+++ b/indra/llmessage/net.h
@@ -43,7 +43,7 @@ void	end_net(S32& socket_out);
 // returns size of packet or -1 in case of error
 S32		receive_packet(int hSocket, char * receiveBuffer);
 
-bool	send_packet(int hSocket, const char *sendBuffer, int size, U32 recipient, int nPort);	// Returns TRUE on success.
+bool	send_packet(int hSocket, const char *sendBuffer, int size, U32 recipient, int nPort);	// Returns true on success.
 
 //void	get_sender(char * tmp);
 LLHost	get_sender();
diff --git a/indra/llmessage/partsyspacket.h b/indra/llmessage/partsyspacket.h
index 0a8e433cbd..76c6b3e202 100644
--- a/indra/llmessage/partsyspacket.h
+++ b/indra/llmessage/partsyspacket.h
@@ -102,7 +102,7 @@ struct LLPartInitData {
 		//How much of an effect does gravity have
 	F32	globalLifetime;
 		//If particles re-spawn, a system can exist forever.
-		//If (ActionFlags & PART_SYS_GLOBAL_DIE) is TRUE this variable is used to determine how long the system lasts.
+		//If (ActionFlags & PART_SYS_GLOBAL_DIE) is true this variable is used to determine how long the system lasts.
 	F32	individualLifetime;
 		//How long does each particle last if nothing else happens to it
 	F32	individualLifetimeRange;
@@ -132,7 +132,7 @@ const int PART_SYS_SLOW_ANIM_BYTE = 0; // slow animation down by a factor of 10
 const int PART_SYS_SLOW_ANIM_BIT = 1;  // useful for tweaking anims during debugging
 
 const int PART_SYS_FOLLOW_VEL_BYTE = 0; // indicates whether to orient sprites towards
-const int PART_SYS_FOLLOW_VEL_BIT = 4;  // their velocity vector -- default is FALSE
+const int PART_SYS_FOLLOW_VEL_BIT = 4;  // their velocity vector -- default is false
 
 const int PART_SYS_IS_LIGHT_BYTE = 0;   // indicates whether a particular particle system
 const int PART_SYS_IS_LIGHT_BIT = 8;    // is also a light object -- for andrew