diff options
| author | Dave Parks <davep@lindenlab.com> | 2022-10-26 17:22:50 -0500 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2022-10-26 17:22:50 -0500 |
| commit | 65eec2ca8fb34fb2aca8e93c8ce6d8e39cfae3e9 (patch) | |
| tree | 3e3c9812af98bc209c274fae70f9aa8eaf2c3c90 /indra/newview/llviewerobject.h | |
| parent | 8f47657d646c06dbba8d44497c0f81fd00730cc8 (diff) | |
| parent | 800044fb33e5e177e45e1bfa9f840a287e0bd186 (diff) | |
Merge branch 'DRTVWR-559' of ssh://bitbucket.org/lindenlab/viewer into DRTVWR-559
Diffstat (limited to 'indra/newview/llviewerobject.h')
| -rw-r--r-- | indra/newview/llviewerobject.h | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/indra/newview/llviewerobject.h b/indra/newview/llviewerobject.h index 31e82545ec..d871382256 100644 --- a/indra/newview/llviewerobject.h +++ b/indra/newview/llviewerobject.h @@ -184,7 +184,12 @@ public: void setHasRenderMaterialParams(bool has_params); const LLUUID& getRenderMaterialID(U8 te) const; - void setRenderMaterialID(U8 te, const LLUUID& id, bool update_server = true); + + // set the RenderMaterialID for the given TextureEntry + // te - TextureEntry index to set, or -1 for all TEs + // id - asset id of material asset + // update_server - if true, will send updates to server + void setRenderMaterialID(S32 te, const LLUUID& id, bool update_server = true); void setRenderMaterialIDs(const LLUUID& id); virtual BOOL isHUDAttachment() const { return FALSE; } |