diff options
| author | Sabrina Shanman <cosmic@lindenlab.com> | 2022-09-20 23:09:30 +0000 |
|---|---|---|
| committer | Sabrina Shanman <cosmic@lindenlab.com> | 2022-09-20 23:09:30 +0000 |
| commit | 58c478f08a9a3f073b7ba8d55874e92d0fe4f373 (patch) | |
| tree | 7c975309a1cb70a74e16b8fc1a736e8452555a46 /indra/newview/llviewerobject.h | |
| parent | a66a65e047fb662e35eaaa68de6da9e2786db8ed (diff) | |
| parent | 3e807dbc29371218e48691a5c1cfd2384bd74030 (diff) | |
Merged in SL-18001 (pull request #1137)
SL-18001: Update GLTF material when receiving LLRenderMaterialParams on updated object
Approved-by: Brad Kittenbrink
Diffstat (limited to 'indra/newview/llviewerobject.h')
| -rw-r--r-- | indra/newview/llviewerobject.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/indra/newview/llviewerobject.h b/indra/newview/llviewerobject.h index 109c96dc9c..680cfb9639 100644 --- a/indra/newview/llviewerobject.h +++ b/indra/newview/llviewerobject.h @@ -185,6 +185,7 @@ public: const LLUUID& getRenderMaterialID(U8 te) const; void setRenderMaterialID(U8 te, const LLUUID& id); + void setRenderMaterialIDs(const LLRenderMaterialParams* material_params, bool local_origin); virtual BOOL isHUDAttachment() const { return FALSE; } virtual BOOL isTempAttachment() const; |