diff options
| author | Erik Kundiman <erik@megapahit.org> | 2024-06-11 09:12:53 +0800 |
|---|---|---|
| committer | Erik Kundiman <erik@megapahit.org> | 2024-06-11 09:12:53 +0800 |
| commit | dedd91fdcabe5af455bbbb1cb0149aea30b0faf9 (patch) | |
| tree | 246d37024406883c917e0c54ce61306552b1671c /indra/llrender/llgltexture.cpp | |
| parent | b0e7f040658132d398fd2b29585ed5ae782c1fdd (diff) | |
| parent | 730d94779c0e798ec91b269b530a08f0eebaa13d (diff) | |
Merge tag '7.1.8-release'
source for viewer 7.1.8.9375512768
Diffstat (limited to 'indra/llrender/llgltexture.cpp')
| -rw-r--r-- | indra/llrender/llgltexture.cpp | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/indra/llrender/llgltexture.cpp b/indra/llrender/llgltexture.cpp index 944a3d0235..104976fcc6 100644 --- a/indra/llrender/llgltexture.cpp +++ b/indra/llrender/llgltexture.cpp @@ -49,6 +49,10 @@ LLGLTexture::LLGLTexture(const LLImageRaw* raw, BOOL usemipmaps) mUseMipMaps = usemipmaps ; // Create an empty image of the specified size and width mGLTexturep = new LLImageGL(raw, usemipmaps) ; + mFullWidth = mGLTexturep->getCurrentWidth(); + mFullHeight = mGLTexturep->getCurrentHeight(); + mComponents = mGLTexturep->getComponents(); + setTexelsPerImage(); } LLGLTexture::~LLGLTexture() @@ -95,7 +99,8 @@ void LLGLTexture::setBoostLevel(S32 level) mBoostLevel = level ; if(mBoostLevel != LLGLTexture::BOOST_NONE && mBoostLevel != LLGLTexture::BOOST_ICON - && mBoostLevel != LLGLTexture::BOOST_THUMBNAIL) + && mBoostLevel != LLGLTexture::BOOST_THUMBNAIL + && mBoostLevel != LLGLTexture::BOOST_TERRAIN) { setNoDelete() ; } |