diff --git a/indra/llcommon/llsingleton.h b/indra/llcommon/llsingleton.h
index 67722aa8d65aabe76b863b844ca0c4c512ddc5cb..49a0d9e923c2062e7fb6370c8705f1bc5e235e88 100644
--- a/indra/llcommon/llsingleton.h
+++ b/indra/llcommon/llsingleton.h
@@ -587,7 +587,7 @@ class LLSingleton : public LLSingletonBase
     }
 
     // Thread unsafe access
-    inline static DERIVED_TYPE* getInstanceFast()
+    static DERIVED_TYPE* getInstanceFast()
     {
         if (!sUnsafeInstance)
         {
@@ -605,7 +605,7 @@ class LLSingleton : public LLSingletonBase
     }
 
     // Thread unsafe access
-    inline static DERIVED_TYPE& instanceFast()
+    static DERIVED_TYPE& instanceFast()
     {
         return *getInstanceFast();
     }
diff --git a/indra/llimage/llimage.cpp b/indra/llimage/llimage.cpp
index 67ed16956689fc26e14a00b07ffe4f48d448c788..b25336adf4f36d9111fa88a2593db066710c98b0 100644
--- a/indra/llimage/llimage.cpp
+++ b/indra/llimage/llimage.cpp
@@ -1781,14 +1781,8 @@ bool LLImageRaw::validateSrcAndDst(std::string func, LLImageRaw* src, LLImageRaw
 }
 
 //----------------------------------------------------------------------------
-
-static struct
-{
-	const char* exten;
-	EImageCodec codec;
-}
-file_extensions[] =
-{
+std::array<std::pair<const char*, EImageCodec>, 11> file_extensions =
+{ {
 	{ "bmp", IMG_CODEC_BMP },
 	{ "tga", IMG_CODEC_TGA },
 	{ "j2c", IMG_CODEC_J2C },
@@ -1800,8 +1794,8 @@ file_extensions[] =
 	{ "dxt", IMG_CODEC_DXT },
 	{ "png", IMG_CODEC_PNG },
 	{ "webp", IMG_CODEC_WEBP }
-};
-#define NUM_FILE_EXTENSIONS LL_ARRAY_SIZE(file_extensions)
+} };
+
 #if 0
 static std::string find_file(std::string &name, S8 *codec)
 {
@@ -1825,10 +1819,10 @@ EImageCodec LLImageBase::getCodecFromExtension(const std::string& exten)
 {
 	if (!exten.empty())
 	{
-		for (int i = 0; i < (int)(NUM_FILE_EXTENSIONS); i++)
+		for (const auto& exten_pair : file_extensions)
 		{
-			if (exten == file_extensions[i].exten)
-				return file_extensions[i].codec;
+			if (exten == exten_pair.first)
+				return exten_pair.second;
 		}
 	}
 	return IMG_CODEC_INVALID;