diff options
| author | Dave Parks <davep@lindenlab.com> | 2022-09-22 17:27:41 -0500 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2022-09-22 17:27:41 -0500 |
| commit | 0afc237de2b3c8286efda25f9ca72aa710bc81ef (patch) | |
| tree | 9cb3dd377963500eae8899723a4f6294f952235e /indra/newview/llviewerobject.h | |
| parent | e5d463ca200bdfa93b8c65e588d490c2f23e3918 (diff) | |
| parent | 524e5f06b7665cf7b26f451998a418d2cfe9ae13 (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 | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/indra/newview/llviewerobject.h b/indra/newview/llviewerobject.h index 680cfb9639..32f03c7869 100644 --- a/indra/newview/llviewerobject.h +++ b/indra/newview/llviewerobject.h @@ -184,8 +184,8 @@ public: void setHasRenderMaterialParams(bool has_params); const LLUUID& getRenderMaterialID(U8 te) const; - void setRenderMaterialID(U8 te, const LLUUID& id); - void setRenderMaterialIDs(const LLRenderMaterialParams* material_params, bool local_origin); + void setRenderMaterialID(U8 te, const LLUUID& id, bool update_server = true); + void setRenderMaterialIDs(const LLUUID& id); virtual BOOL isHUDAttachment() const { return FALSE; } virtual BOOL isTempAttachment() const; @@ -220,6 +220,7 @@ public: F32 getRotTime() { return mRotTime; } private: void resetRotTime(); + void setRenderMaterialIDs(const LLRenderMaterialParams* material_params, bool local_origin); public: void resetRot(); void applyAngularVelocity(F32 dt); |