Automated merge with ssh://bitbucket.org/nat_linden/viewer-no-leap-test

1 files changed, 2 insertions, 9 deletions

diff --git a/indra/llprimitive/llprimtexturelist.cpp b/indra/llprimitive/llprimtexturelist.cpp
index 6aae2f97c6..f4f08248b8 100755
--- a/indra/llprimitive/llprimtexturelist.cpp
+++ b/indra/llprimitive/llprimtexturelist.cpp
@@ -368,18 +368,11 @@ S32 LLPrimTextureList::setMaterialID(const U8 index, const LLMaterialID& pMateri
 	return TEM_CHANGE_NONE;
 }
 
-S32 LLPrimTextureList::setMaterialParams(const U8 index, const LLMaterialPtr pMaterialParams, bool isInitFromServer)
+S32 LLPrimTextureList::setMaterialParams(const U8 index, const LLMaterialPtr pMaterialParams)
 {
 	if (index < mEntryList.size())
 	{
-		if (!isInitFromServer && mEntryList[index]->isMatParamsInitFromServer())
-		{
-			return TEM_CHANGE_NONE;
-		}
-		else
-		{
-			return mEntryList[index]->setMaterialParams(pMaterialParams);
-		}
+		return mEntryList[index]->setMaterialParams(pMaterialParams);
 	}
 	return TEM_CHANGE_NONE;
 }