From 19c9bbae355dcacbbcd78eebd6604dfd83006a73 Mon Sep 17 00:00:00 2001
From: Ansariel <none@none>
Date: Wed, 11 Nov 2015 19:37:58 +0100
Subject: [PATCH] Backed out changeset d95a9752af5f for merge with backout fix
 from LL

---
 indra/llprimitive/llprimtexturelist.cpp | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/indra/llprimitive/llprimtexturelist.cpp b/indra/llprimitive/llprimtexturelist.cpp
index 268430f335..6aae2f97c6 100755
--- a/indra/llprimitive/llprimtexturelist.cpp
+++ b/indra/llprimitive/llprimtexturelist.cpp
@@ -372,13 +372,11 @@ S32 LLPrimTextureList::setMaterialParams(const U8 index, const LLMaterialPtr pMa
 {
 	if (index < mEntryList.size())
 	{
-		// <FS:Ansariel> MAINT-5733 / BUG-10459: Scripted alpha mode changes don't show up until after relog
-		//if (!isInitFromServer && mEntryList[index]->isMatParamsInitFromServer())
-		//{
-		//	return TEM_CHANGE_NONE;
-		//}
-		//else
-		// </FS:Ansariel>
+		if (!isInitFromServer && mEntryList[index]->isMatParamsInitFromServer())
+		{
+			return TEM_CHANGE_NONE;
+		}
+		else
 		{
 			return mEntryList[index]->setMaterialParams(pMaterialParams);
 		}