Merge branch 'DRTVWR-525' of https://bitbucket.org/lindenlab/viewer
commit
41ce0bec35
|
|
@ -1366,6 +1366,7 @@ Sovereign Engineer
|
|||
SL-14707
|
||||
SL-14731
|
||||
SL-14732
|
||||
SL-15096
|
||||
SpacedOut Frye
|
||||
VWR-34
|
||||
VWR-45
|
||||
|
|
|
|||
|
|
@ -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);
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue