diff options
| author | Brad Linden <brad@lindenlab.com> | 2024-05-14 13:56:06 -0700 |
|---|---|---|
| committer | Brad Linden <brad@lindenlab.com> | 2024-05-14 13:56:06 -0700 |
| commit | 1c2cf6a0f744665eb5c805a77493258712d2c540 (patch) | |
| tree | 91521dad560f5173057b2da5ad3634b0b3e73f93 /indra/llprimitive | |
| parent | 7bfb29687c2e621d3aae9e2794a57dc0168fdf1d (diff) | |
| parent | 31a3423239a1312e430909ad899d60003363541f (diff) | |
Merge branch 'brad/gltf-dev-merge-main-and-featurettes' 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 |