diff options
| author | vyacheslavsproductengine <vyacheslavsproductengine@lindenlab.com> | 2015-05-19 22:54:54 +0400 |
|---|---|---|
| committer | vyacheslavsproductengine <vyacheslavsproductengine@lindenlab.com> | 2015-05-19 22:54:54 +0400 |
| commit | cdbc220a9748959cb3b33e38f1ece1b6e145f594 (patch) | |
| tree | 5689aef3d72cc9c15c58c4c3e97d83a23f19a411 /indra/newview/llviewerobject.h | |
| parent | 193a298266c251a6be153cf37f5b2d2aa8513101 (diff) | |
| parent | 0a333e9a039288969b3ce207772fee8cbeb2ca83 (diff) | |
Слияние
Diffstat (limited to 'indra/newview/llviewerobject.h')
| -rwxr-xr-x | indra/newview/llviewerobject.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llviewerobject.h b/indra/newview/llviewerobject.h index 05c87c153b..db2749f413 100755 --- a/indra/newview/llviewerobject.h +++ b/indra/newview/llviewerobject.h @@ -330,7 +330,7 @@ public: /*virtual*/ S32 setTEMediaFlags(const U8 te, const U8 media_flags ); /*virtual*/ S32 setTEGlow(const U8 te, const F32 glow); /*virtual*/ S32 setTEMaterialID(const U8 te, const LLMaterialID& pMaterialID); - /*virtual*/ S32 setTEMaterialParams(const U8 te, const LLMaterialPtr pMaterialParams); + /*virtual*/ S32 setTEMaterialParams(const U8 te, const LLMaterialPtr pMaterialParams, bool isInitFromServer); // Used by Materials update functions to properly kick off rebuilds // of VBs etc when materials updates require changes. |