diff options
-rw-r--r-- | indra/newview/llfetchedgltfmaterial.h | 3 | ||||
-rw-r--r-- | indra/newview/llgltfmateriallist.h | 2 |
2 files changed, 1 insertions, 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; |