diff options
| author | Brad Linden <46733234+brad-linden@users.noreply.github.com> | 2023-05-03 14:16:34 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-05-03 14:16:34 -0700 |
| commit | b985a699684ce991d0a79c8a56fbbd82a4409fec (patch) | |
| tree | 95ed6a1a684c500b6c54f6fbd440958366e27f26 /indra/llprimitive | |
| parent | 799d7605a9947939c983d7432c2e655a4fc093be (diff) | |
| parent | 5465594a34ec65c1f4eeb9181be190e47e6527ad (diff) | |
Merge pull request #191 from secondlife/brad/SL-19648-refcount-llgltfmaterial-thread-safety
Fix SL-19675 crash due to thread unsafe LLRefCount usage possibly related to SL-19648
Diffstat (limited to 'indra/llprimitive')
| -rw-r--r-- | indra/llprimitive/llgltfmaterial.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/indra/llprimitive/llgltfmaterial.h b/indra/llprimitive/llgltfmaterial.h index 0bd65fadef..ad7784f6d1 100644 --- a/indra/llprimitive/llgltfmaterial.h +++ b/indra/llprimitive/llgltfmaterial.h @@ -167,6 +167,7 @@ public: // set the contents of this LLGLTFMaterial from the given json // returns true if successful + // if unsuccessful, the contents of this LLGLTFMaterial should be left unchanged and false is returned // json - the json text to load from // warn_msg - warning message from TinyGLTF if any // error_msg - error_msg from TinyGLTF if any |