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/llprimitive/llprimitive.cpp | |
| parent | 193a298266c251a6be153cf37f5b2d2aa8513101 (diff) | |
| parent | 0a333e9a039288969b3ce207772fee8cbeb2ca83 (diff) | |
Слияние
Diffstat (limited to 'indra/llprimitive/llprimitive.cpp')
| -rwxr-xr-x | indra/llprimitive/llprimitive.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/llprimitive/llprimitive.cpp b/indra/llprimitive/llprimitive.cpp index 29747cb09c..8e009972d0 100755 --- a/indra/llprimitive/llprimitive.cpp +++ b/indra/llprimitive/llprimitive.cpp @@ -317,9 +317,9 @@ S32 LLPrimitive::setTEMaterialID(const U8 index, const LLMaterialID& pMaterialID return mTextureList.setMaterialID(index, pMaterialID); } -S32 LLPrimitive::setTEMaterialParams(const U8 index, const LLMaterialPtr pMaterialParams) +S32 LLPrimitive::setTEMaterialParams(const U8 index, const LLMaterialPtr pMaterialParams, bool isInitFromServer) { - return mTextureList.setMaterialParams(index, pMaterialParams); + return mTextureList.setMaterialParams(index, pMaterialParams, isInitFromServer); } LLMaterialPtr LLPrimitive::getTEMaterialParams(const U8 index) |