diff options
| author | Jonathan "Geenz" Goodman <geenz@geenzo.com> | 2023-03-27 15:06:27 -0700 |
|---|---|---|
| committer | Jonathan "Geenz" Goodman <geenz@geenzo.com> | 2023-03-27 15:06:27 -0700 |
| commit | 91a9a94df115fa2a69abb6cb1a6eacb569f08eef (patch) | |
| tree | 5afcc8e94c37d0aa5dc680ce32b0510ba429ef69 /indra/llprimitive/llmaterial.cpp | |
| parent | 6c554c9c92a0150fdf5a177bf33269eac8341d02 (diff) | |
| parent | c20058b7a7207cb80426796d9d77864c696a5eec (diff) | |
Merge branch 'DRTVWR-559' of https://github.com/secondlife/viewer into DRTVWR-559
Diffstat (limited to 'indra/llprimitive/llmaterial.cpp')
| -rw-r--r-- | indra/llprimitive/llmaterial.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llprimitive/llmaterial.cpp b/indra/llprimitive/llmaterial.cpp index a694a666c6..37525e4a3d 100644 --- a/indra/llprimitive/llmaterial.cpp +++ b/indra/llprimitive/llmaterial.cpp @@ -481,7 +481,7 @@ LLUUID LLMaterial::getHash() const LL_PROFILE_ZONE_SCOPED_CATEGORY_TEXTURE; // HACK - hash the bytes of this LLMaterial, but trim off the S32 in LLRefCount LLUUID id; - HBXXH128::digest(id, (unsigned char*)this + sizeof(S32), sizeof(this) - sizeof(S32)); + HBXXH128::digest(id, (unsigned char*)this + sizeof(LLRefCount), sizeof(*this) - sizeof(LLRefCount)); return id; } |