summaryrefslogtreecommitdiff
path: root/indra/llprimitive/tests
diff options
context:
space:
mode:
authorNat Goodspeed <nat@lindenlab.com>2024-05-07 16:49:49 -0400
committerNat Goodspeed <nat@lindenlab.com>2024-05-07 16:49:49 -0400
commita9900fa8ce0ec932d05b01bed40b946c1ec13078 (patch)
tree7712df90eb34795b1920f4a3e7d0274f8e0f698d /indra/llprimitive/tests
parentd4f384b4ec55758a7f2ca4338894ea6cacc98eec (diff)
parent10aa7f4254fd04c24f15f507188705146f92ee60 (diff)
Merge remote-tracking branch 'origin/main' into nat/cleanup-timers
Diffstat (limited to 'indra/llprimitive/tests')
-rw-r--r--indra/llprimitive/tests/llgltfmaterial_test.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llprimitive/tests/llgltfmaterial_test.cpp b/indra/llprimitive/tests/llgltfmaterial_test.cpp
index 88b6fae3a7..b56c9ab4f5 100644
--- a/indra/llprimitive/tests/llgltfmaterial_test.cpp
+++ b/indra/llprimitive/tests/llgltfmaterial_test.cpp
@@ -143,7 +143,7 @@ namespace tut
#if LL_WINDOWS
// If any fields are added/changed, these tests should be updated (consider also updating ASSET_VERSION in LLGLTFMaterial)
// This test result will vary between compilers, so only test a single platform
- ensure_equals("fields supported for GLTF (sizeof check)", sizeof(LLGLTFMaterial), 216);
+ ensure_equals("fields supported for GLTF (sizeof check)", sizeof(LLGLTFMaterial), 224);
#endif
#endif
ensure_equals("LLGLTFMaterial texture info count", (U32)LLGLTFMaterial::GLTF_TEXTURE_INFO_COUNT, 4);