livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Backed out changeset d95a9752af5f for merge with backout fix from LL

master
Ansariel 2015-11-11 19:37:58 +01:00
parent 89ccdc8b67
commit 19c9bbae35
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
indra/llprimitive/llprimtexturelist.cpp
View File

@ -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);
}