diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2023-05-04 09:01:22 -0400 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2023-05-04 09:01:22 -0400 |
| commit | a57013082d9cd890e24d2a79dedd405c24471e6d (patch) | |
| tree | 51742d1ec6fc467a7036dcff49a03fdd0f44ec59 /indra/llprimitive | |
| parent | 21ddaa690875450bbd2f7d665da22d390a0f2a88 (diff) | |
| parent | a9dca4577337037f1b4a62713927871666014043 (diff) | |
DRTVWR-559: Merge 'DRTVWR-559' into DRTVWR-559-zapfunc
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 |