From b9b8fa1f5f4959517de1013e0bf610cedecb2426 Mon Sep 17 00:00:00 2001
From: Brad Kittenbrink <brad@lindenlab.com>
Date: Tue, 18 Oct 2022 16:46:43 -0700
Subject: Fix ror mac build error in SL-18391 lifetime management

---
 indra/newview/llfetchedgltfmaterial.h | 3 ---
 indra/newview/llgltfmateriallist.h    | 2 +-
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/indra/newview/llfetchedgltfmaterial.h b/indra/newview/llfetchedgltfmaterial.h
index 115e85a5e2..4cbe6651c4 100644
--- a/indra/newview/llfetchedgltfmaterial.h
+++ b/indra/newview/llfetchedgltfmaterial.h
@@ -43,6 +43,3 @@ protected:
     bool mFetching;
 };
 
-extern LLGLTFMaterialList gGLTFMaterialList;
-
-
diff --git a/indra/newview/llgltfmateriallist.h b/indra/newview/llgltfmateriallist.h
index 4b905e32c9..be2d21e90d 100644
--- a/indra/newview/llgltfmateriallist.h
+++ b/indra/newview/llgltfmateriallist.h
@@ -49,7 +49,7 @@ public:
 
     static void registerCallbacks();
 private:
-    typedef std::unordered_map<LLUUID, LLPointer<LLFetchedGLTFMaterial > > uuid_mat_map_t;
+    typedef std::map<LLUUID, LLPointer<LLFetchedGLTFMaterial > > uuid_mat_map_t;
     uuid_mat_map_t mList;
 
     LLUUID mLastUpdateKey;
-- 
cgit v1.2.3