diff options
| author | Ansariel <ansariel.hiller@phoenixviewer.com> | 2024-05-10 15:16:06 +0200 |
|---|---|---|
| committer | Ansariel <ansariel.hiller@phoenixviewer.com> | 2024-05-10 15:16:06 +0200 |
| commit | 799ebf21624edb8b42ca16b8cf51c138643efd32 (patch) | |
| tree | 438df7d344821c75c65625353198542103b18f9f /indra/llprimitive | |
| parent | 155ddf23363f1d5c534c69f50505faf67e51948f (diff) | |
Fix broken merge and BOOL/bool issues
Diffstat (limited to 'indra/llprimitive')
| -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 90f1ecfa8f..a613fc52af 100644 --- a/indra/llprimitive/llgltfmaterial.h +++ b/indra/llprimitive/llgltfmaterial.h @@ -120,12 +120,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: |