diff options
| author | Cosmic Linden <cosmic@lindenlab.com> | 2024-05-13 15:23:33 -0700 |
|---|---|---|
| committer | Cosmic Linden <cosmic@lindenlab.com> | 2024-05-13 15:33:14 -0700 |
| commit | cdcfbab5c4a24c4d9bf7af6bbbb8a8760bcc5189 (patch) | |
| tree | b1bd8cbe3e9a5390bba9c02505c2d7d39eccda6d /indra/llprimitive/llgltfmaterial.h | |
| parent | 9441608623a2692263191c254db23765eefa2cef (diff) | |
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.
Diffstat (limited to 'indra/llprimitive/llgltfmaterial.h')
| -rw-r--r-- | indra/llprimitive/llgltfmaterial.h | 6 |
1 files changed, 0 insertions, 6 deletions
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<LLUUID, LLUUID> local_tex_map_t; - local_tex_map_t mTrackingIdToLocalTexture; public: |