summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xdoc/contributions.txt1
-rw-r--r--indra/newview/llvosky.cpp9
2 files changed, 2 insertions, 8 deletions
diff --git a/doc/contributions.txt b/doc/contributions.txt
index f10b4d418c..a1988b749f 100755
--- a/doc/contributions.txt
+++ b/doc/contributions.txt
@@ -1359,6 +1359,7 @@ Sovereign Engineer
SL-14707
SL-14731
SL-14732
+ SL-15096
SpacedOut Frye
VWR-34
VWR-45
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);
}