diff options
| author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2016-01-15 16:42:39 -0500 |
|---|---|---|
| committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2016-01-15 16:42:39 -0500 |
| commit | 3612d7d14b1e481402bb3d7cbfb552cd19a3fc0a (patch) | |
| tree | f3dabe49f7953e24de207a6a0939da5539d5acca /indra/llprimitive/llprimitive.cpp | |
| parent | a6c8de97bbb2609d24e212672b192650aed91e1e (diff) | |
| parent | 5a5c023e291990a463b1a91846ce82c70da8daab (diff) | |
merge
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 9eff74f1e8..186716609c 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, bool isInitFromServer) +S32 LLPrimitive::setTEMaterialParams(const U8 index, const LLMaterialPtr pMaterialParams) { - return mTextureList.setMaterialParams(index, pMaterialParams, isInitFromServer); + return mTextureList.setMaterialParams(index, pMaterialParams); } LLMaterialPtr LLPrimitive::getTEMaterialParams(const U8 index) |