From cdcfbab5c4a24c4d9bf7af6bbbb8a8760bcc5189 Mon Sep 17 00:00:00 2001 From: Cosmic Linden Date: Mon, 13 May 2024 15:23:33 -0700 Subject: secondlife/viewer#907: Fix bad merge in LLGLTFMaterial Caused by a conflict between the LLGLTFMaterial::getHash fix, and an improvement in LLGLTFMaterial field ordering for platform-dependent memory reduction. --- indra/llprimitive/llgltfmaterial.h | 6 ------ 1 file changed, 6 deletions(-) (limited to 'indra/llprimitive') diff --git a/indra/llprimitive/llgltfmaterial.h b/indra/llprimitive/llgltfmaterial.h index 7888ba3b05..1b0ab19f71 100644 --- a/indra/llprimitive/llgltfmaterial.h +++ b/indra/llprimitive/llgltfmaterial.h @@ -125,12 +125,6 @@ public: // heightmaps cannot currently be described as finite enclosed // volumes. // See also LLPanelRegionTerrainInfo::validateMaterials - bool mDoubleSided = false; - - - // These fields are local to viewer and are a part of local bitmap support - typedef std::map local_tex_map_t; - local_tex_map_t mTrackingIdToLocalTexture; public: -- cgit v1.2.3