diff options
| author | vyacheslavsproductengine <vyacheslavsproductengine@lindenlab.com> | 2015-05-19 19:28:03 +0400 |
|---|---|---|
| committer | vyacheslavsproductengine <vyacheslavsproductengine@lindenlab.com> | 2015-05-19 19:28:03 +0400 |
| commit | 0a333e9a039288969b3ce207772fee8cbeb2ca83 (patch) | |
| tree | 1081ecee820deefefaf9a7a818420589141a204f /indra/llprimitive/llprimitive.h | |
| parent | 496139fe56bd456b6bdc1a32726e32fd1b07631a (diff) | |
MAINT-3548 - FIXED-R2 Horizontal & vertical offset values for normal & specular maps still randomly revert to previous settings when building.
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 1bf83e36b4..db7327e900 100755 --- a/indra/llprimitive/llprimitive.h +++ b/indra/llprimitive/llprimitive.h @@ -385,7 +385,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); + virtual S32 setTEMaterialParams(const U8 index, const LLMaterialPtr pMaterialParams, bool isInitFromServer); virtual BOOL setMaterial(const U8 material); // returns TRUE if material changed virtual void setTESelected(const U8 te, bool sel); |