diff options
| author | Ptolemy <ptolemy@lindenlab.com> | 2022-08-31 10:16:24 -0700 |
|---|---|---|
| committer | Ptolemy <ptolemy@lindenlab.com> | 2022-08-31 10:16:24 -0700 |
| commit | 71115a7a2727301dbf8ba62a082cc9fa1d310a8d (patch) | |
| tree | 1fff229e1dd5365945bd850ab1e84c8ca693846d /indra/newview/llviewertexture.cpp | |
| parent | 5c0e201cd61cf7b29b8871864c8fc7f90c82b5cd (diff) | |
| parent | 8eaee1f033d9dac892e749cc65416e149021d8f6 (diff) | |
SL-17703: Fix merge
Diffstat (limited to 'indra/newview/llviewertexture.cpp')
| -rw-r--r-- | indra/newview/llviewertexture.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/indra/newview/llviewertexture.cpp b/indra/newview/llviewertexture.cpp index 1a0471186f..52294ec487 100644 --- a/indra/newview/llviewertexture.cpp +++ b/indra/newview/llviewertexture.cpp @@ -76,6 +76,7 @@ LLPointer<LLViewerFetchedTexture> LLViewerFetchedTexture::sWhiteImagep = NULL; LLPointer<LLViewerFetchedTexture> LLViewerFetchedTexture::sDefaultImagep = NULL; LLPointer<LLViewerFetchedTexture> LLViewerFetchedTexture::sSmokeImagep = NULL; LLPointer<LLViewerFetchedTexture> LLViewerFetchedTexture::sFlatNormalImagep = NULL; +LLPointer<LLViewerFetchedTexture> LLViewerFetchedTexture::sDefaultIrradiancePBRp; LLViewerMediaTexture::media_map_t LLViewerMediaTexture::sMediaMap; LLTexturePipelineTester* LLViewerTextureManager::sTesterp = NULL; F32 LLViewerFetchedTexture::sMaxVirtualSize = 8192.f*8192.f; @@ -457,6 +458,7 @@ void LLViewerTextureManager::cleanup() LLViewerFetchedTexture::sWhiteImagep = NULL; LLViewerFetchedTexture::sFlatNormalImagep = NULL; + LLViewerFetchedTexture::sDefaultIrradiancePBRp = NULL; LLViewerMediaTexture::cleanUpClass(); } |