From 94b92868587c652d7140aa704db42e497482827d Mon Sep 17 00:00:00 2001 From: Andrey Kleshchev Date: Thu, 22 Sep 2022 02:14:51 +0300 Subject: SL-17999 'copy' functionality for 'features' and 'texture' tabs And a fix to prevent message spam --- indra/newview/llviewerobject.h | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'indra/newview/llviewerobject.h') 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); -- cgit v1.2.3