diff options
| author | Michael Pohoreski <ptolemy@lindenlab.com> | 2021-04-16 22:56:03 +0000 |
|---|---|---|
| committer | Michael Pohoreski <ptolemy@lindenlab.com> | 2021-04-16 22:56:03 +0000 |
| commit | 18316191cd7d1e1f8c3a4940eb5ed6cdf2695575 (patch) | |
| tree | ebf9657f0fe449947fc9d275c0d6e163715144a2 | |
| parent | 2130b6b144b64c223a656206f0d3e9babfd9a863 (diff) | |
| parent | b58c15b1bd77ea2f5fa5b00bf870d04f93772651 (diff) | |
Merged in SL-15096b (pull request #540)
SL-15096: Merge SovereignEngineer's fix for SL-14035 regression
Approved-by: Euclid Linden
| -rwxr-xr-x | doc/contributions.txt | 1 | ||||
| -rw-r--r-- | indra/newview/llvosky.cpp | 9 |
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); } |