diff options
| author | Dave Parks <davep@lindenlab.com> | 2024-08-28 10:57:53 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-08-28 10:57:53 -0500 |
| commit | 9d689c6145cefcc86b228462279859dfb726429d (patch) | |
| tree | db1944a9a05dfde76ceb023793c780a7fe7d9767 /indra/newview/llviewertexture.cpp | |
| parent | 5c16ae13758bdfe8fe1f13d5f67eabbb6eaa30a1 (diff) | |
| parent | 00acf4fdb7e953726240f76f8b5103c82e0ce692 (diff) | |
Merge pull request #2435 from secondlife/2432-default-nametags-to-only-show-briefly
#2432 default nametags to only show briefly and #2431 fix redundant search for pixiesmall.j2c
Diffstat (limited to 'indra/newview/llviewertexture.cpp')
| -rw-r--r-- | indra/newview/llviewertexture.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/indra/newview/llviewertexture.cpp b/indra/newview/llviewertexture.cpp index f221efae7e..bb16fec32a 100644 --- a/indra/newview/llviewertexture.cpp +++ b/indra/newview/llviewertexture.cpp @@ -70,6 +70,7 @@ LLPointer<LLViewerTexture> LLViewerTexture::sBlackImagep = nullptr; LLPointer<LLViewerTexture> LLViewerTexture::sCheckerBoardImagep = nullptr; LLPointer<LLViewerFetchedTexture> LLViewerFetchedTexture::sMissingAssetImagep = nullptr; LLPointer<LLViewerFetchedTexture> LLViewerFetchedTexture::sWhiteImagep = nullptr; +LLPointer<LLViewerFetchedTexture> LLViewerFetchedTexture::sDefaultParticleImagep = nullptr; LLPointer<LLViewerFetchedTexture> LLViewerFetchedTexture::sDefaultImagep = nullptr; LLPointer<LLViewerFetchedTexture> LLViewerFetchedTexture::sSmokeImagep = nullptr; LLPointer<LLViewerFetchedTexture> LLViewerFetchedTexture::sFlatNormalImagep = nullptr; |