diff options
| author | cosmic-linden <111533034+cosmic-linden@users.noreply.github.com> | 2023-01-11 10:36:35 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-01-11 10:36:35 -0800 |
| commit | 7e1f4e4cc7588131e12b3fc7542e10d066aad93f (patch) | |
| tree | d1abc294fe0a7508d6d3b9d0b6661694b11719d9 /indra/newview/llviewerobject.h | |
| parent | b4f53334141b179bdb1762636ce313f14d9e2b10 (diff) | |
| parent | 693925ef23ef41e3927a9654a7f423d0e24ce19a (diff) | |
Merge pull request #48 from secondlife/SL-18820
Sl 18820: Build floater should preserve GLTF transforms when changing the PBR material
Diffstat (limited to 'indra/newview/llviewerobject.h')
| -rw-r--r-- | indra/newview/llviewerobject.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llviewerobject.h b/indra/newview/llviewerobject.h index 8c4afdcba4..71d7a7ebbb 100644 --- a/indra/newview/llviewerobject.h +++ b/indra/newview/llviewerobject.h @@ -188,7 +188,7 @@ public: // 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 + // update_server - if true, will send updates to server and clear most overrides void setRenderMaterialID(S32 te, const LLUUID& id, bool update_server = true); void setRenderMaterialIDs(const LLUUID& id); |