From 0a686d3f3639bca20b5cf9e95fb862bbe54eb40e Mon Sep 17 00:00:00 2001
From: Rye Mutt <rye@alchemyviewer.org>
Date: Fri, 5 Mar 2021 00:27:34 -0500
Subject: [PATCH] Fix debug helper to work in static func
---
indra/llfilesystem/lldiskcache.cpp | 3 ++-
indra/llfilesystem/lldiskcache.h | 2 +-
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/indra/llfilesystem/lldiskcache.cpp b/indra/llfilesystem/lldiskcache.cpp
index 3b5fa8bc804..c0b3a856189 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 4ebc3366721..494f78ebcd3 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
--
GitLab