summaryrefslogtreecommitdiff
path: root/indra/newview/llvovolume.h
diff options
context:
space:
mode:
authorvyacheslavsproductengine <vyacheslavsproductengine@lindenlab.com>2015-05-19 19:28:03 +0400
committervyacheslavsproductengine <vyacheslavsproductengine@lindenlab.com>2015-05-19 19:28:03 +0400
commit0a333e9a039288969b3ce207772fee8cbeb2ca83 (patch)
tree1081ecee820deefefaf9a7a818420589141a204f /indra/newview/llvovolume.h
parent496139fe56bd456b6bdc1a32726e32fd1b07631a (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/newview/llvovolume.h')
-rwxr-xr-xindra/newview/llvovolume.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llvovolume.h b/indra/newview/llvovolume.h
index bbaca316b0..3e33bbd71c 100755
--- a/indra/newview/llvovolume.h
+++ b/indra/newview/llvovolume.h
@@ -192,7 +192,7 @@ public:
static void setTEMaterialParamsCallbackTE(const LLUUID& objectID, const LLMaterialID& pMaterialID, const LLMaterialPtr pMaterialParams, U32 te);
- /*virtual*/ S32 setTEMaterialParams(const U8 te, const LLMaterialPtr pMaterialParams);
+ /*virtual*/ S32 setTEMaterialParams(const U8 te, const LLMaterialPtr pMaterialParams, bool isInitFromServer);
/*virtual*/ S32 setTEScale(const U8 te, const F32 s, const F32 t);
/*virtual*/ S32 setTEScaleS(const U8 te, const F32 s);
/*virtual*/ S32 setTEScaleT(const U8 te, const F32 t);