From a652cb4f0a0750e62c42563b7579e1814c9e39b5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Liru=20F=C3=A6rs?= <lirusaito@gmail.com>
Date: Tue, 25 Feb 2020 13:25:12 -0500
Subject: [PATCH] Collaboration between myself and Router the Gray to Flinux

---
 indra/llmath/lloctree.h        |  6 +++---
 indra/newview/NACLantispam.cpp |  8 ++++----
 indra/newview/llspeakers.cpp   | 12 ++++++------
 3 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/indra/llmath/lloctree.h b/indra/llmath/lloctree.h
index b8b06e6eb..a663f8549 100644
--- a/indra/llmath/lloctree.h
+++ b/indra/llmath/lloctree.h
@@ -537,7 +537,7 @@ public:
 					OctreeStats::getInstance()->realloc(old_cap,mData.capacity());
 #endif
 				
-				notifyAddition(data);
+				this->notifyAddition(data);
 				return true;
 			}
 			else
@@ -593,7 +593,7 @@ public:
 						OctreeStats::getInstance()->realloc(old_cap,mData.capacity());
 #endif
 					
-					notifyAddition(data);
+					this->notifyAddition(data);
 					return true;
 				}
 
@@ -704,7 +704,7 @@ public:
 #endif
 		}
 
-		notifyRemoval(data);
+		this->notifyRemoval(data);
 		checkAlive();
 	}
 
diff --git a/indra/newview/NACLantispam.cpp b/indra/newview/NACLantispam.cpp
index ba51b6515..584f9e319 100644
--- a/indra/newview/NACLantispam.cpp
+++ b/indra/newview/NACLantispam.cpp
@@ -68,7 +68,7 @@ private:
 	protected:
 		void reset() { updateTime(); mAmount = 1; mBlocked = false; }
 		const U32& getAmount() const { return mAmount; }
-		const U32& getTime() const { return mTime; }
+		const std::time_t& getTime() const { return mTime; }
 		void updateTime() { mTime = time(nullptr); }
 		void block() { mBlocked = true; }
 		bool withinBlockTime(const U32& time_limit) const { return (time(nullptr) - mTime) <= time_limit; }
@@ -146,7 +146,7 @@ bool is_collision_sound(const std::string& sound)
 }
 // NaClAntiSpamRegistry
 
-constexpr std::array<char*, NACLAntiSpamRegistry::QUEUE_MAX> QUEUE_NAME = {
+constexpr std::array<const char*, NACLAntiSpamRegistry::QUEUE_MAX> QUEUE_NAME = {
 	"Chat",
 	"Inventory",
 	"Instant Message",
@@ -178,7 +178,7 @@ void NACLAntiSpamRegistry::initializeQueues(bool global, const U32& time, const
 		mGlobalQueue.reset(new NACLAntiSpamQueue(time, amount));
 	else
 	{
-		mQueues.reset(new std::array<NACLAntiSpamQueue, QUEUE_MAX>{
+		mQueues.reset(new std::array<NACLAntiSpamQueue, QUEUE_MAX>{{
 			NACLAntiSpamQueue(time, amount), // QUEUE_CHAT
 			NACLAntiSpamQueue(time, amount), // QUEUE_INVENTORY
 			NACLAntiSpamQueue(time, amount), // QUEUE_IM
@@ -187,7 +187,7 @@ void NACLAntiSpamRegistry::initializeQueues(bool global, const U32& time, const
 			NACLAntiSpamQueue(time, amount), // QUEUE_SOUND_PRELOAD
 			NACLAntiSpamQueue(time, amount), // QUEUE_SCRIPT_DIALOG
 			NACLAntiSpamQueue(time, amount)  // QUEUE_TELEPORT
-		});
+		}});
 	}
 }
 
diff --git a/indra/newview/llspeakers.cpp b/indra/newview/llspeakers.cpp
index 222e9a674..2eb588e7d 100644
--- a/indra/newview/llspeakers.cpp
+++ b/indra/newview/llspeakers.cpp
@@ -813,16 +813,16 @@ void LLIMSpeakerMgr::updateSpeakers(const LLSD& update)
 	std::vector<speaker_entry_t> speakerentries;
 	if ( update.has("agent_updates") && update["agent_updates"].isMap() )
 	{
-		for (const auto& update : update["agent_updates"].map())
+		for (const auto& update_it : update["agent_updates"].map())
 		{
-			LLUUID agent_id(update.first);
+			LLUUID agent_id(update_it.first);
 			LLPointer<LLSpeaker> speakerp = findSpeaker(agent_id);
 
 			bool new_speaker = false;
 			boost::optional<bool> moderator;
 			boost::optional<bool> moderator_muted_text;
 
-			LLSD agent_data = update.second;
+			LLSD agent_data = update_it.second;
 			if (agent_data.isMap() && agent_data.has("transition"))
 			{
 				if (agent_data["transition"].asString() == "LEAVE")
@@ -869,12 +869,12 @@ void LLIMSpeakerMgr::updateSpeakers(const LLSD& update)
 	}
 	else if ( update.has("updates") && update["updates"].isMap() )
 	{
-		for (const auto& update : update["updates"].map())
+		for (const auto& update_it : update["updates"].map())
 		{
-			LLUUID agent_id(update.first);
+			LLUUID agent_id(update_it.first);
 			LLPointer<LLSpeaker> speakerp = findSpeaker(agent_id);
 
-			std::string agent_transition = update.second.asString();
+			std::string agent_transition = update_it.second.asString();
 			if (agent_transition == "LEAVE")
 			{
 				setSpeakerNotInChannel(speakerp);