diff --git a/indra/llcommon/CMakeLists.txt b/indra/llcommon/CMakeLists.txt
index 5b3ccc8291b3c7fb4f672a221a2d784a6b89aeeb..a192f3b60343bf58ed7214ee0b6af3a1e92214fb 100644
--- a/indra/llcommon/CMakeLists.txt
+++ b/indra/llcommon/CMakeLists.txt
@@ -324,8 +324,6 @@ if(USE_PRECOMPILED_HEADERS)
     <boost/unordered/unordered_flat_set.hpp>
     <boost/unordered/unordered_map.hpp>
     <boost/unordered/unordered_set.hpp>
-    <fmt/format.h>
-    <fmt/compile.h>
     )
 endif()
 
diff --git a/indra/llcommon/llformat.h b/indra/llcommon/llformat.h
index e046d12d7b8066379efdcf8100c15d039d085532..911fa1b2139f08c943628cd5809f327c965e1f50 100644
--- a/indra/llcommon/llformat.h
+++ b/indra/llcommon/llformat.h
@@ -28,8 +28,15 @@
 #ifndef LL_LLFORMAT_H
 #define LL_LLFORMAT_H
 
+#if LL_WINDOWS
+#pragma warning (push)
+#pragma warning (disable : 4702) // compiler thinks unreachable code, but no
+#endif
 #include <fmt/format.h>
 #include <fmt/compile.h>
+#if LL_WINDOWS
+#pragma warning (pop)
+#endif
 
 // Use as follows:
 // LL_INFOS() << llformat("Test:%d (%.2f %.2f)", idx, x, y) << LL_ENDL;
diff --git a/indra/llcommon/llqueuedthread.cpp b/indra/llcommon/llqueuedthread.cpp
index c764ac4c6b83e85344af233e56932307097451f9..fd992753feec73f22812601eca1f07d679ad8023 100644
--- a/indra/llcommon/llqueuedthread.cpp
+++ b/indra/llcommon/llqueuedthread.cpp
@@ -245,7 +245,6 @@ bool LLQueuedThread::addRequest(QueuedRequest* req)
 
 	unlockData();
 
-    llassert(!mDataLock->isSelfLocked());
     mRequestQueue.post([this, req]() { processRequest(req); });
 
 	return true;
@@ -452,8 +451,6 @@ void LLQueuedThread::processRequest(LLQueuedThread::QueuedRequest* req)
                 
                 unlockData();
 
-                llassert(!mDataLock->isSelfLocked());
-
 #if 0
                 // try again on next frame
                 // NOTE: tried using "post" with a time in the future, but this
diff --git a/indra/llcommon/lluuid.cpp b/indra/llcommon/lluuid.cpp
index eb923c474fb4b8c20fdc2e4e920001cc045a227a..c5956e0558fa091827badc448fbdbd01d73fc3c4 100644
--- a/indra/llcommon/lluuid.cpp
+++ b/indra/llcommon/lluuid.cpp
@@ -425,8 +425,6 @@ BOOL LLUUID::set(const std::string_view in_string, BOOL emit)
 #else
     return parseInternalScalar(in_string.data(), broken_format, emit);
 #endif
-
-	return TRUE;
 }
 
 BOOL validate_internal_scalar(const char* str_ptr, bool broken_format)
diff --git a/indra/llmessage/llbuffer.cpp b/indra/llmessage/llbuffer.cpp
index 8706e11adf96331b2d6458d71f09ce7956aade5d..6aaf4c9917520d0f23dde84a592f4be8657937e4 100644
--- a/indra/llmessage/llbuffer.cpp
+++ b/indra/llmessage/llbuffer.cpp
@@ -35,7 +35,7 @@
 #include "llmutex.h"
 #include <iterator>
 
-#define ASSERT_LLBUFFERARRAY_MUTEX_LOCKED() llassert(!mMutexp || mMutexp->isSelfLocked())
+#define ASSERT_LLBUFFERARRAY_MUTEX_LOCKED() 
 
 /** 
  * LLSegment
diff --git a/indra/newview/alfloaterlightbox.cpp b/indra/newview/alfloaterlightbox.cpp
index 7ebd8327ad0cdbca4b2b9b9fa192addbd7b5ebbf..0a5c7c27156a17dc457629358b98b3c23f2b93f1 100644
--- a/indra/newview/alfloaterlightbox.cpp
+++ b/indra/newview/alfloaterlightbox.cpp
@@ -340,66 +340,66 @@ void ALFloaterLightBox::updateTonemapper()
 		text1->setVisible(TRUE);
 		text1->setText(std::string("Max Brightness"));
 		spinner1->setVisible(TRUE);
-		spinner1->setMinValue(0.01);
-		spinner1->setMaxValue(8.0);
-		spinner1->setIncrement(0.1);
+		spinner1->setMinValue(0.01f);
+		spinner1->setMaxValue(8.0f);
+		spinner1->setIncrement(0.1f);
 		spinner1->setControlName("AlchemyToneMapUchimuraMaxBrightness");
 		slider1->setVisible(TRUE);
-		slider1->setMinValue(0.01);
-		slider1->setMaxValue(8.0);
-		slider1->setIncrement(0.1);
+		slider1->setMinValue(0.01f);
+		slider1->setMaxValue(8.0f);
+		slider1->setIncrement(0.1f);
 		slider1->setControlName("AlchemyToneMapUchimuraMaxBrightness", nullptr);
 
 		text2->setVisible(TRUE);
 		text2->setText(std::string("Contrast"));
 		spinner2->setVisible(TRUE);
-		spinner2->setMinValue(0.01);
-		spinner2->setMaxValue(2.0);
-		spinner2->setIncrement(0.01);
+		spinner2->setMinValue(0.01f);
+		spinner2->setMaxValue(2.0f);
+		spinner2->setIncrement(0.01f);
 		spinner2->setControlName("AlchemyToneMapUchimuraContrast");
 		slider2->setVisible(TRUE);
-		slider2->setMinValue(0.01);
-		slider2->setMaxValue(2.0);
-		slider2->setIncrement(0.01);
+		slider2->setMinValue(0.01f);
+		slider2->setMaxValue(2.0f);
+		slider2->setIncrement(0.01f);
 		slider2->setControlName("AlchemyToneMapUchimuraContrast", nullptr);
 
 		text3->setVisible(TRUE);
 		text3->setText(std::string("Linear Start"));
 		spinner3->setVisible(TRUE);
-		spinner3->setMinValue(0.01);
-		spinner3->setMaxValue(1.0);
-		spinner3->setIncrement(0.01);
+		spinner3->setMinValue(0.01f);
+		spinner3->setMaxValue(1.0f);
+		spinner3->setIncrement(0.01f);
 		spinner3->setControlName("AlchemyToneMapUchimuraLinearStart");
 		slider3->setVisible(TRUE);
-		slider3->setMinValue(0.01);
-		slider3->setMaxValue(1.0);
-		slider3->setIncrement(0.01);
+		slider3->setMinValue(0.01f);
+		slider3->setMaxValue(1.0f);
+		slider3->setIncrement(0.01f);
 		slider3->setControlName("AlchemyToneMapUchimuraLinearStart", nullptr);
 
 		text4->setVisible(TRUE);
 		text4->setText(std::string("Linear Length"));
 		spinner4->setVisible(TRUE);
-		spinner4->setMinValue(0.01);
-		spinner4->setMaxValue(1.0);
-		spinner4->setIncrement(0.01);
+		spinner4->setMinValue(0.01f);
+		spinner4->setMaxValue(1.0f);
+		spinner4->setIncrement(0.01f);
 		spinner4->setControlName("AlchemyToneMapUchimuraLinearLength");
 		slider4->setVisible(TRUE);
-		slider4->setMinValue(0.01);
-		slider4->setMaxValue(1.0);
-		slider4->setIncrement(0.01);
+		slider4->setMinValue(0.01f);
+		slider4->setMaxValue(1.0f);
+		slider4->setIncrement(0.01f);
 		slider4->setControlName("AlchemyToneMapUchimuraLinearLength", nullptr);
 
 		text5->setVisible(TRUE);
 		text5->setText(std::string("Black Level"));
 		spinner5->setVisible(TRUE);
-		spinner5->setMinValue(0.01);
-		spinner5->setMaxValue(4.0);
-		spinner5->setIncrement(0.01);
+		spinner5->setMinValue(0.01f);
+		spinner5->setMaxValue(4.0f);
+		spinner5->setIncrement(0.01f);
 		spinner5->setControlName("AlchemyToneMapUchimuraBlackLevel");
 		slider5->setVisible(TRUE);
-		slider5->setMinValue(0.01);
-		slider5->setMaxValue(4.0);
-		slider5->setIncrement(0.01);
+		slider5->setMinValue(0.01f);
+		slider5->setMaxValue(4.0f);
+		slider5->setIncrement(0.01f);
 		slider5->setControlName("AlchemyToneMapUchimuraBlackLevel", nullptr);
 
 		text6->setVisible(FALSE);
@@ -416,79 +416,79 @@ void ALFloaterLightBox::updateTonemapper()
 		text1->setVisible(TRUE);
 		text1->setText(std::string("HDR Max"));
 		spinner1->setVisible(TRUE);
-		spinner1->setMinValue(1.0);
-		spinner1->setMaxValue(512.0);
+		spinner1->setMinValue(1.0f);
+		spinner1->setMaxValue(512.0f);
 		spinner1->setIncrement(1.f);
 		spinner1->setControlName("AlchemyToneMapAMDHDRMax");
 		slider1->setVisible(TRUE);
-		slider1->setMinValue(1.0);
-		slider1->setMaxValue(512.0);
+		slider1->setMinValue(1.0f);
+		slider1->setMaxValue(512.0f);
 		slider1->setIncrement(1.f);
 		slider1->setControlName("AlchemyToneMapAMDHDRMax", nullptr);
 
 		text2->setVisible(TRUE);
 		text2->setText(std::string("Tone Exposure"));
 		spinner2->setVisible(TRUE);
-		spinner2->setMinValue(1.0);
-		spinner2->setMaxValue(16.0);
-		spinner2->setIncrement(0.1);
+		spinner2->setMinValue(1.0f);
+		spinner2->setMaxValue(16.0f);
+		spinner2->setIncrement(0.1f);
 		spinner2->setControlName("AlchemyToneMapAMDExposure");
 		slider2->setVisible(TRUE);
-		slider2->setMinValue(1.0);
-		slider2->setMaxValue(16.0);
-		slider2->setIncrement(0.1);
+		slider2->setMinValue(1.0f);
+		slider2->setMaxValue(16.0f);
+		slider2->setIncrement(0.1f);
 		slider2->setControlName("AlchemyToneMapAMDExposure", nullptr);
 
 		text3->setVisible(TRUE);
 		text3->setText(std::string("Contrast"));
 		spinner3->setVisible(TRUE);
-		spinner3->setMinValue(0.0);
-		spinner3->setMaxValue(1.0);
-		spinner3->setIncrement(0.01);
+		spinner3->setMinValue(0.0f);
+		spinner3->setMaxValue(1.0f);
+		spinner3->setIncrement(0.01f);
 		spinner3->setControlName("AlchemyToneMapAMDContrast");
 		slider3->setVisible(TRUE);
-		slider3->setMinValue(0.0);
-		slider3->setMaxValue(1.0);
-		slider3->setIncrement(0.01);
+		slider3->setMinValue(0.0f);
+		slider3->setMaxValue(1.0f);
+		slider3->setIncrement(0.01f);
 		slider3->setControlName("AlchemyToneMapAMDContrast", nullptr);
 
 		text4->setVisible(TRUE);
 		text4->setText(std::string("R Saturation"));
 		spinner4->setVisible(TRUE);
-		spinner4->setMinValue(-2.0);
-		spinner4->setMaxValue(2.0);
-		spinner4->setIncrement(0.1);
+		spinner4->setMinValue(-2.0f);
+		spinner4->setMaxValue(2.0f);
+		spinner4->setIncrement(0.1f);
 		spinner4->setControlName("AlchemyToneMapAMDSaturationR");
 		slider4->setVisible(TRUE);
-		slider4->setMinValue(-2.0);
-		slider4->setMaxValue(2.0);
-		slider4->setIncrement(0.1);
+		slider4->setMinValue(-2.0f);
+		slider4->setMaxValue(2.0f);
+		slider4->setIncrement(0.1f);
 		slider4->setControlName("AlchemyToneMapAMDSaturationR", nullptr);
 
 		text5->setVisible(TRUE);
 		text5->setText(std::string("G Saturation"));
 		spinner5->setVisible(TRUE);
-		spinner5->setMinValue(-2.0);
-		spinner5->setMaxValue(2.0);
-		spinner5->setIncrement(0.1);
+		spinner5->setMinValue(-2.0f);
+		spinner5->setMaxValue(2.0f);
+		spinner5->setIncrement(0.1f);
 		spinner5->setControlName("AlchemyToneMapAMDSaturationG");
 		slider5->setVisible(TRUE);
-		slider5->setMinValue(-2.0);
-		slider5->setMaxValue(2.0);
-		slider5->setIncrement(0.1);
+		slider5->setMinValue(-2.0f);
+		slider5->setMaxValue(2.0f);
+		slider5->setIncrement(0.1f);
 		slider5->setControlName("AlchemyToneMapAMDSaturationG", nullptr);
 
 		text6->setVisible(TRUE);
 		text6->setText(std::string("B Saturation"));
 		spinner6->setVisible(TRUE);
-		spinner6->setMinValue(-2.0);
-		spinner6->setMaxValue(2.0);
-		spinner6->setIncrement(0.1);
+		spinner6->setMinValue(-2.0f);
+		spinner6->setMaxValue(2.0f);
+		spinner6->setIncrement(0.1f);
 		spinner6->setControlName("AlchemyToneMapAMDSaturationB");
 		slider6->setVisible(TRUE);
-		slider6->setMinValue(-2.0);
-		slider6->setMaxValue(2.0);
-		slider6->setIncrement(0.1);
+		slider6->setMinValue(-2.0f);
+		slider6->setMaxValue(2.0f);
+		slider6->setIncrement(0.1f);
 		slider6->setControlName("AlchemyToneMapAMDSaturationB", nullptr);
 
 		text7->setVisible(FALSE);
@@ -501,92 +501,92 @@ void ALFloaterLightBox::updateTonemapper()
 		text1->setVisible(TRUE);
 		text1->setText(std::string("Toe Strength"));
 		spinner1->setVisible(TRUE);
-		spinner1->setMinValue(0.0);
-		spinner1->setMaxValue(1.0);
-		spinner1->setIncrement(0.01);
+		spinner1->setMinValue(0.0f);
+		spinner1->setMaxValue(1.0f);
+		spinner1->setIncrement(0.01f);
 		spinner1->setControlName("AlchemyToneMapFilmicToeStr");
 		slider1->setVisible(TRUE);
-		slider1->setMinValue(0.0);
-		slider1->setMaxValue(1.0);
-		slider1->setIncrement(0.01);
+		slider1->setMinValue(0.0f);
+		slider1->setMaxValue(1.0f);
+		slider1->setIncrement(0.01f);
 		slider1->setControlName("AlchemyToneMapFilmicToeStr", nullptr);
 
 		text2->setVisible(TRUE);
 		text2->setText(std::string("Toe Length"));
 		spinner2->setVisible(TRUE);
-		spinner2->setMinValue(0.01);
-		spinner2->setMaxValue(1.0);
-		spinner2->setIncrement(0.01);
+		spinner2->setMinValue(0.01f);
+		spinner2->setMaxValue(1.0f);
+		spinner2->setIncrement(0.01f);
 		spinner2->setControlName("AlchemyToneMapFilmicToeLen");
 		slider2->setVisible(TRUE);
-		slider2->setMinValue(0.01);
-		slider2->setMaxValue(1.0);
-		slider2->setIncrement(0.01);
+		slider2->setMinValue(0.01f);
+		slider2->setMaxValue(1.0f);
+		slider2->setIncrement(0.01f);
 		slider2->setControlName("AlchemyToneMapFilmicToeLen", nullptr);
 
 		text3->setVisible(TRUE);
 		text3->setText(std::string("Shoulder Strength"));
 		spinner3->setVisible(TRUE);
-		spinner3->setMinValue(0.0);
-		spinner3->setMaxValue(1.0);
-		spinner3->setIncrement(0.01);
+		spinner3->setMinValue(0.0f);
+		spinner3->setMaxValue(1.0f);
+		spinner3->setIncrement(0.01f);
 		spinner3->setControlName("AlchemyToneMapFilmicShoulderStr");
 		slider3->setVisible(TRUE);
-		slider3->setMinValue(0.0);
-		slider3->setMaxValue(1.0);
-		slider3->setIncrement(0.01);
+		slider3->setMinValue(0.0f);
+		slider3->setMaxValue(1.0f);
+		slider3->setIncrement(0.01f);
 		slider3->setControlName("AlchemyToneMapFilmicShoulderStr", nullptr);
 
 		text4->setVisible(TRUE);
 		text4->setText(std::string("Shoulder Length"));
 		spinner4->setVisible(TRUE);
-		spinner4->setMinValue(0.01);
-		spinner4->setMaxValue(8.0);
-		spinner4->setIncrement(0.01);
+		spinner4->setMinValue(0.01f);
+		spinner4->setMaxValue(8.0f);
+		spinner4->setIncrement(0.01f);
 		spinner4->setControlName("AlchemyToneMapFilmicShoulderLen");
 		slider4->setVisible(TRUE);
-		slider4->setMinValue(0.01);
-		slider4->setMaxValue(8.0);
-		slider4->setIncrement(0.01);
+		slider4->setMinValue(0.01f);
+		slider4->setMaxValue(8.0f);
+		slider4->setIncrement(0.01f);
 		slider4->setControlName("AlchemyToneMapFilmicShoulderLen", nullptr);
 
 		text5->setVisible(TRUE);
 		text5->setText(std::string("Shoulder Angle"));
 		spinner5->setVisible(TRUE);
-		spinner5->setMinValue(0.0);
-		spinner5->setMaxValue(1.0);
-		spinner5->setIncrement(0.01);
+		spinner5->setMinValue(0.0f);
+		spinner5->setMaxValue(1.0f);
+		spinner5->setIncrement(0.01f);
 		spinner5->setControlName("AlchemyToneMapFilmicShoulderAngle");
 		slider5->setVisible(TRUE);
-		slider5->setMinValue(0.0);
-		slider5->setMaxValue(1.0);
-		slider5->setIncrement(0.01);
+		slider5->setMinValue(0.0f);
+		slider5->setMaxValue(1.0f);
+		slider5->setIncrement(0.01f);
 		slider5->setControlName("AlchemyToneMapFilmicShoulderAngle", nullptr);
 
 		text6->setVisible(TRUE);
 		text6->setText(std::string("Gamma"));
 		spinner6->setVisible(TRUE);
-		spinner6->setMinValue(0.01);
-		spinner6->setMaxValue(5.0);
-		spinner6->setIncrement(0.01);
+		spinner6->setMinValue(0.01f);
+		spinner6->setMaxValue(5.0f);
+		spinner6->setIncrement(0.01f);
 		spinner6->setControlName("AlchemyToneMapFilmicGamma");
 		slider6->setVisible(TRUE);
-		slider6->setMinValue(0.01);
-		slider6->setMaxValue(5.0);
-		slider6->setIncrement(0.01);
+		slider6->setMinValue(0.01f);
+		slider6->setMaxValue(5.0f);
+		slider6->setIncrement(0.01f);
 		slider6->setControlName("AlchemyToneMapFilmicGamma", nullptr);
 
 		text7->setVisible(TRUE);
 		text7->setText(std::string("White Point"));
 		spinner7->setVisible(TRUE);
-		spinner7->setMinValue(1.0);
-		spinner7->setMaxValue(16.0);
-		spinner7->setIncrement(0.1);
+		spinner7->setMinValue(1.0f);
+		spinner7->setMaxValue(16.0f);
+		spinner7->setIncrement(0.1f);
 		spinner7->setControlName("AlchemyToneMapFilmicWhitePoint");
 		slider7->setVisible(TRUE);
-		slider7->setMinValue(1.0);
-		slider7->setMaxValue(16.0);
-		slider7->setIncrement(0.1);
+		slider7->setMinValue(1.0f);
+		slider7->setMaxValue(16.0f);
+		slider7->setIncrement(0.1f);
 		slider7->setControlName("AlchemyToneMapFilmicWhitePoint", nullptr);
 		break;
 	}
@@ -617,14 +617,14 @@ void ALFloaterLightBox::updateCAS()
 	case ALRenderUtil::SHARPEN_CAS:
 	{
 		spinner1->setVisible(TRUE);
-		spinner1->setMinValue(0.0);
-		spinner1->setMaxValue(1.0);
-		spinner1->setIncrement(0.1);
+		spinner1->setMinValue(0.0f);
+		spinner1->setMaxValue(1.0f);
+		spinner1->setIncrement(0.1f);
 		spinner1->setControlName("RenderSharpenCASSharpness");
 		slider1->setVisible(TRUE);
-		slider1->setMinValue(0.0);
-		slider1->setMaxValue(1.0);
-		slider1->setIncrement(0.1);
+		slider1->setMinValue(0.0f);
+		slider1->setMaxValue(1.0f);
+		slider1->setIncrement(0.1f);
 		slider1->setControlName("RenderSharpenCASSharpness", nullptr);
 
 		text2->setVisible(FALSE);
@@ -635,27 +635,27 @@ void ALFloaterLightBox::updateCAS()
 	case ALRenderUtil::SHARPEN_DLS:
 	{
 		spinner1->setVisible(TRUE);
-		spinner1->setMinValue(0.0);
-		spinner1->setMaxValue(1.0);
-		spinner1->setIncrement(0.1);
+		spinner1->setMinValue(0.0f);
+		spinner1->setMaxValue(1.0f);
+		spinner1->setIncrement(0.1f);
 		spinner1->setControlName("RenderSharpenDLSSharpness");
 		slider1->setVisible(TRUE);
-		slider1->setMinValue(0.0);
-		slider1->setMaxValue(1.0);
-		slider1->setIncrement(0.1);
+		slider1->setMinValue(0.0f);
+		slider1->setMaxValue(1.0f);
+		slider1->setIncrement(0.1f);
 		slider1->setControlName("RenderSharpenDLSSharpness", nullptr);
 
 		text2->setVisible(TRUE);
 		text2->setText(std::string("Denoise:"));
 		spinner2->setVisible(TRUE);
-		spinner2->setMinValue(0.0);
-		spinner2->setMaxValue(1.0);
-		spinner2->setIncrement(0.1);
+		spinner2->setMinValue(0.0f);
+		spinner2->setMaxValue(1.0f);
+		spinner2->setIncrement(0.1f);
 		spinner2->setControlName("RenderSharpenDLSDenoise");
 		slider2->setVisible(TRUE);
-		slider2->setMinValue(0.0);
-		slider2->setMaxValue(1.0);
-		slider2->setIncrement(0.1);
+		slider2->setMinValue(0.0f);
+		slider2->setMaxValue(1.0f);
+		slider2->setIncrement(0.1f);
 		slider2->setControlName("RenderSharpenDLSDenoise", nullptr);
 		break;
 	}
diff --git a/indra/newview/lldrawable.cpp b/indra/newview/lldrawable.cpp
index 257a21ef5e9bff4258b03c4c50bdf58d69808aa4..ed9cb0801ca7cec8305861635fa727dbd37236c2 100644
--- a/indra/newview/lldrawable.cpp
+++ b/indra/newview/lldrawable.cpp
@@ -140,7 +140,7 @@ void LLDrawable::init(bool new_entry)
 		llassert(!vo_entry->getGroup()); //not in the object cache octree.
 	}
 	
-	llassert(!vo_entry || vo_entry->getEntry() == mEntry);
+	llassert(!vo_entry || vo_entry->getEntry() == mEntry.get());
 
 	initVisible(sCurVisible - 2);//invisible for the current frame and the last frame.
 }
diff --git a/indra/newview/llviewerobject.cpp b/indra/newview/llviewerobject.cpp
index 0eae3f8cd61263d1a47b34639eea53fc982b6d74..577726dfce8e0baa70fea1b0484d1a328cdeba68 100644
--- a/indra/newview/llviewerobject.cpp
+++ b/indra/newview/llviewerobject.cpp
@@ -6388,7 +6388,7 @@ LLViewerObject::ExtraParameter* LLViewerObject::createNewParameterEntry(U16 para
 	{
 		entry.in_use = in_use;
 		*entry.in_use = false; // not in use yet
-        llassert(mExtraParameterList[param_type] == nullptr); // leak -- redundantly allocated parameter entry
+        llassert(mExtraParameterList[param_type].data == nullptr); // leak -- redundantly allocated parameter entry
 		entry.data = new_block;
 		return &entry;
 	}
diff --git a/indra/newview/llviewerprecompiledheaders.h b/indra/newview/llviewerprecompiledheaders.h
index 44c92c169223886988f0ab765c1d43c9f7ec916e..3d0a0d5eef6870b7d1f25232291ed29efeb8c4cf 100644
--- a/indra/newview/llviewerprecompiledheaders.h
+++ b/indra/newview/llviewerprecompiledheaders.h
@@ -48,9 +48,6 @@
 #include "boost/unordered/unordered_flat_set.hpp"
 #include "boost/unordered/unordered_flat_map.hpp"
 
-#include <fmt/format.h>
-#include <fmt/compile.h>
-
 // Library headers from llcommon project:
 #include "indra_constants.h"
 #include "llinitparam.h"
diff --git a/indra/newview/llviewerstatsrecorder.cpp b/indra/newview/llviewerstatsrecorder.cpp
index c671f8c634caa2ce6da7c46eba7a6860d3c9655d..34130625a69b72a7b9d05258cf5778aa8e66bbe1 100644
--- a/indra/newview/llviewerstatsrecorder.cpp
+++ b/indra/newview/llviewerstatsrecorder.cpp
@@ -44,7 +44,7 @@ LLViewerStatsRecorder::LLViewerStatsRecorder() :
 	mLastSnapshotTime(0.0),
     mEnableStatsRecording(false),
     mEnableStatsLogging(false),
-    mInterval(0.2),
+    mInterval(0.2f),
     mMaxDuration(300.f),
     mSkipSaveIfZeros(false)
 {
diff --git a/indra/newview/llvoavatar.cpp b/indra/newview/llvoavatar.cpp
index 7a1ac7ca6902c7f4fefeafb3e28226cb1fc39e07..9b0af0294ad3a94546fcc9e721f9e8cc04664781 100644
--- a/indra/newview/llvoavatar.cpp
+++ b/indra/newview/llvoavatar.cpp
@@ -3156,8 +3156,8 @@ void LLVOAvatar::idleUpdateLoadingEffect()
 			particle_parameters.mPartData.mEndScale			 = LLVector2(1.000250f, 1.000250f);
 		    particle_parameters.mPartData.mStartGlow		 = 0;
 		    particle_parameters.mPartData.mEndGlow			 = 0;
-			particle_parameters.mPartData.mStartColor        = LLColor4(0.501773, 0.743102, 1.000000, 1.f);
-			particle_parameters.mPartData.mEndColor          = LLColor4(0.000000, 0.000000, 0.000000, 1.f);
+			particle_parameters.mPartData.mStartColor        = LLColor4(0.501773f, 0.743102f, 1.000000f, 1.f);
+			particle_parameters.mPartData.mEndColor          = LLColor4(0.000000f, 0.000000f, 0.000000f, 1.f);
 			particle_parameters.mPartData.mBlendFuncSource	 = LLPartData::LL_PART_BF_SOURCE_COLOR;
 			particle_parameters.mPartData.mBlendFuncDest	 = LLPartData::LL_PART_BF_SOURCE_ALPHA;