From d048795fce3ab83989cb909fde02014f1442cc84 Mon Sep 17 00:00:00 2001 From: Dave Parks Date: Fri, 5 Aug 2022 16:58:22 -0500 Subject: SL-17870 Nudge PBR material textures so they start downloading. (and add missing validation code for reflection probes network data). --- indra/llprimitive/llprimitive.cpp | 2 ++ 1 file changed, 2 insertions(+) (limited to 'indra/llprimitive') diff --git a/indra/llprimitive/llprimitive.cpp b/indra/llprimitive/llprimitive.cpp index 3f0059b759..8b470d235c 100644 --- a/indra/llprimitive/llprimitive.cpp +++ b/indra/llprimitive/llprimitive.cpp @@ -1701,6 +1701,8 @@ BOOL LLNetworkData::isValid(U16 param_type, U32 size) return (size == 4); case PARAMS_RENDER_MATERIAL: return (size > 1); + case PARAMS_REFLECTION_PROBE: + return (size == 9); } return FALSE; -- cgit v1.2.3 From 7558641610895f1192c0fefa152437524e431eb3 Mon Sep 17 00:00:00 2001 From: Dave Parks Date: Mon, 8 Aug 2022 15:34:56 -0500 Subject: SL-17937 Fix for broken PBR material batching. --- indra/llprimitive/llgltfmaterial.h | 2 ++ 1 file changed, 2 insertions(+) (limited to 'indra/llprimitive') diff --git a/indra/llprimitive/llgltfmaterial.h b/indra/llprimitive/llgltfmaterial.h index a8d5fb8e85..ab381ca55e 100644 --- a/indra/llprimitive/llgltfmaterial.h +++ b/indra/llprimitive/llgltfmaterial.h @@ -61,8 +61,10 @@ public: // get a UUID based on a hash of this LLGLTFMaterial LLUUID getHash() const { + LL_PROFILE_ZONE_SCOPED_CATEGORY_TEXTURE; LLMD5 md5; md5.update((unsigned char*) this, sizeof(this)); + md5.finalize(); LLUUID id; md5.raw_digest(id.mData); return id; -- cgit v1.2.3