diff --git a/indra/llfilesystem/lldiskcache.cpp b/indra/llfilesystem/lldiskcache.cpp
index 3b5fa8bc8048e5e9f7f88e02f2f5518c3d2bc8c8..c0b3a8561895d8063ae8776614169b713b8a75f4 100644
--- a/indra/llfilesystem/lldiskcache.cpp
+++ b/indra/llfilesystem/lldiskcache.cpp
@@ -139,6 +139,7 @@ void LLDiskCache::purge()
     }
 }
 
+//static
 const std::string LLDiskCache::assetTypeToString(LLAssetType::EType at)
 {
     /**
@@ -146,7 +147,7 @@ const std::string LLDiskCache::assetTypeToString(LLAssetType::EType at)
      * for inline initialization of an std::map<>
      */
     typedef std::map<LLAssetType::EType, std::string> asset_type_to_name_t;
-    asset_type_to_name_t asset_type_to_name =
+    static asset_type_to_name_t asset_type_to_name =
     {
         { LLAssetType::AT_TEXTURE, "TEXTURE" },
         { LLAssetType::AT_SOUND, "SOUND" },
diff --git a/indra/llfilesystem/lldiskcache.h b/indra/llfilesystem/lldiskcache.h
index 4ebc3366721e56a961d3fc439b5d7bfe517cefcb..494f78ebcd3096db54063595f8a3b43ee757117e 100644
--- a/indra/llfilesystem/lldiskcache.h
+++ b/indra/llfilesystem/lldiskcache.h
@@ -137,7 +137,7 @@ class LLDiskCache :
          * Utility function to convert an LLAssetType enum into a
          * string that we use as part of the cache file filename
          */
-        const std::string assetTypeToString(LLAssetType::EType at);
+        static const std::string assetTypeToString(LLAssetType::EType at);
 
         /**
          * Utility function to create the cache directory structure