diff options
| author | Brad Linden <brad@lindenlab.com> | 2024-05-14 11:07:13 -0700 |
|---|---|---|
| committer | Brad Linden <brad@lindenlab.com> | 2024-05-14 11:07:13 -0700 |
| commit | 31a3423239a1312e430909ad899d60003363541f (patch) | |
| tree | 93a7cd46544e69543794654b29068a74437af7d1 /indra/llprimitive | |
| parent | 193d9d5f767c2bfad1dc5ced4fa630d05ae798ae (diff) | |
| parent | 1e9e5a7b7629276d509c352699fb5891c2dc6587 (diff) | |
Merge remote-tracking branch 'origin/release/materials_featurette' into project/gltf_development
Diffstat (limited to 'indra/llprimitive')
| -rw-r--r-- | indra/llprimitive/llgltfmaterial.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/indra/llprimitive/llgltfmaterial.h b/indra/llprimitive/llgltfmaterial.h index 1b0ab19f71..23a39593cf 100644 --- a/indra/llprimitive/llgltfmaterial.h +++ b/indra/llprimitive/llgltfmaterial.h @@ -125,7 +125,6 @@ public: // heightmaps cannot currently be described as finite enclosed // volumes. // See also LLPanelRegionTerrainInfo::validateMaterials - public: // get a UUID based on a hash of this LLGLTFMaterial |