diff options
| author | Xiaohong Bao <bao@lindenlab.com> | 2010-02-11 15:35:22 -0800 |
|---|---|---|
| committer | Xiaohong Bao <bao@lindenlab.com> | 2010-02-11 15:35:22 -0800 |
| commit | 17707455d2e43ae53a102106068609af59f37226 (patch) | |
| tree | 2feea2077cc8289b52dbcd23ca5b8340456bd7e2 /indra/newview | |
| parent | fb994809f40641f883a6b8c184a7d9f5a0b009b3 (diff) | |
additional fix for EXT-4632: LLViewerMediaTexture::getMaxVirtualSize() sometimes returns bad values
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/llviewertexture.cpp | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/indra/newview/llviewertexture.cpp b/indra/newview/llviewertexture.cpp index 984f003411..dd16c4795f 100644 --- a/indra/newview/llviewertexture.cpp +++ b/indra/newview/llviewertexture.cpp @@ -2885,12 +2885,11 @@ LLViewerMediaTexture::~LLViewerMediaTexture() void LLViewerMediaTexture::reinit(BOOL usemipmaps /* = TRUE */) { - mGLTexturep = NULL ; - init(false); + llassert(mGLTexturep.notNull()) ; + mUseMipMaps = usemipmaps ; getLastReferencedTimer()->reset() ; - - generateGLTexture() ; + mGLTexturep->setUseMipMaps(mUseMipMaps) ; mGLTexturep->setNeedsAlphaAndPickMask(FALSE) ; } |