summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
authorMichael Pohoreski <ptolemy@lindenlab.com>2021-04-16 22:56:03 +0000
committerMichael Pohoreski <ptolemy@lindenlab.com>2021-04-16 22:56:03 +0000
commit18316191cd7d1e1f8c3a4940eb5ed6cdf2695575 (patch)
treeebf9657f0fe449947fc9d275c0d6e163715144a2 /indra
parent2130b6b144b64c223a656206f0d3e9babfd9a863 (diff)
parentb58c15b1bd77ea2f5fa5b00bf870d04f93772651 (diff)
Merged in SL-15096b (pull request #540)
SL-15096: Merge SovereignEngineer's fix for SL-14035 regression Approved-by: Euclid Linden
Diffstat (limited to 'indra')
-rw-r--r--indra/newview/llvosky.cpp9
1 files changed, 1 insertions, 8 deletions
diff --git a/indra/newview/llvosky.cpp b/indra/newview/llvosky.cpp
index 2037aca7e9..878d7287ed 100644
--- a/indra/newview/llvosky.cpp
+++ b/indra/newview/llvosky.cpp
@@ -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);
}