From 6b86da34341e308b4112100b7963afcab6cd36ee Mon Sep 17 00:00:00 2001 From: Ansariel Date: Tue, 13 Oct 2015 14:33:20 +0200 Subject: [PATCH] MAINT-5733 / BUG-10459: Disable code preventing scripted alpha mode changes not showing up until after relog for now until it is properly fixed --- indra/llprimitive/llprimtexturelist.cpp | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/indra/llprimitive/llprimtexturelist.cpp b/indra/llprimitive/llprimtexturelist.cpp index 6aae2f97c6..268430f335 100755 --- a/indra/llprimitive/llprimtexturelist.cpp +++ b/indra/llprimitive/llprimtexturelist.cpp @@ -372,11 +372,13 @@ S32 LLPrimTextureList::setMaterialParams(const U8 index, const LLMaterialPtr pMa { if (index < mEntryList.size()) { - if (!isInitFromServer && mEntryList[index]->isMatParamsInitFromServer()) - { - return TEM_CHANGE_NONE; - } - else + // 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 + // { return mEntryList[index]->setMaterialParams(pMaterialParams); }