diff options
| author | ruslantproductengine <ruslantproductengine@lindenlab.com> | 2015-11-11 17:59:14 +0200 |
|---|---|---|
| committer | ruslantproductengine <ruslantproductengine@lindenlab.com> | 2015-11-11 17:59:14 +0200 |
| commit | 049c795b1276202a844ea54c9129515238127b3c (patch) | |
| tree | 697882dadcb6b397b3dfcdfa5ed73a33fe8f289c /indra/llprimitive/llprimitive.h | |
| parent | c29fbae9d68ea5bf6d9b5256279071164544d83f (diff) | |
Backed out changeset: a79540758404
Need backed out this changes because it influence on material
update see: MAINT-5818
Also this lead to the following:
UserA and UserB logged in same location.
UserA edit normal/specular map texture offsets while UserB is not observe this
changes.
Diffstat (limited to 'indra/llprimitive/llprimitive.h')
| -rwxr-xr-x | indra/llprimitive/llprimitive.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llprimitive/llprimitive.h b/indra/llprimitive/llprimitive.h index 54870fbb10..19d9d52817 100755 --- a/indra/llprimitive/llprimitive.h +++ b/indra/llprimitive/llprimitive.h @@ -384,7 +384,7 @@ public: virtual S32 setTEMediaFlags(const U8 te, const U8 flags); virtual S32 setTEGlow(const U8 te, const F32 glow); virtual S32 setTEMaterialID(const U8 te, const LLMaterialID& pMaterialID); - virtual S32 setTEMaterialParams(const U8 index, const LLMaterialPtr pMaterialParams, bool isInitFromServer); + virtual S32 setTEMaterialParams(const U8 index, const LLMaterialPtr pMaterialParams); virtual BOOL setMaterial(const U8 material); // returns TRUE if material changed virtual void setTESelected(const U8 te, bool sel); |