SL-15096: Merge SovereignEngineer's fix for SL-14035 regression

master
Ptolemy 2021-04-16 15:28:00 -07:00
parent 2130b6b144
commit b58c15b1bd
2 changed files with 2 additions and 8 deletions

View File

@ -1359,6 +1359,7 @@ Sovereign Engineer
SL-14707
SL-14731
SL-14732
SL-15096
SpacedOut Frye
VWR-34
VWR-45

View File

@ -209,14 +209,7 @@ void LLSkyTex::create()
void LLSkyTex::createGLImage(S32 which)
{
if (mIsShiny)
{
mTexture[which]->setExplicitFormat(GL_RGBA8, GL_RGBA);
}
else
{
mTexture[which]->setExplicitFormat(GL_SRGB8_ALPHA8, GL_RGBA);
}
mTexture[which]->setExplicitFormat(GL_RGBA8, GL_RGBA);
mTexture[which]->createGLTexture(0, mImageRaw[which], 0, TRUE, LLGLTexture::LOCAL);
mTexture[which]->setAddressMode(LLTexUnit::TAM_CLAMP);
}