From 0a333e9a039288969b3ce207772fee8cbeb2ca83 Mon Sep 17 00:00:00 2001
From: vyacheslavsproductengine <vyacheslavsproductengine@lindenlab.com>
Date: Tue, 19 May 2015 19:28:03 +0400
Subject: MAINT-3548 - FIXED-R2 Horizontal & vertical offset values for normal
 & specular maps still randomly revert to previous settings when building.

---
 indra/llprimitive/llprimtexturelist.cpp | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

(limited to 'indra/llprimitive/llprimtexturelist.cpp')

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