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.h | |
| 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.h')
| -rw-r--r-- | indra/newview/llviewertexture.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/indra/newview/llviewertexture.h b/indra/newview/llviewertexture.h index 3866c898a6..65fa633f81 100644 --- a/indra/newview/llviewertexture.h +++ b/indra/newview/llviewertexture.h @@ -507,6 +507,7 @@ public: static LLPointer<LLViewerFetchedTexture> sDefaultImagep; // "Default" texture for error cases, the only case of fetched texture which is generated in local. static LLPointer<LLViewerFetchedTexture> sFlatNormalImagep; // Flat normal map denoting no bumpiness on a surface static LLPointer<LLViewerFetchedTexture> sDefaultIrradiancePBRp; // PBR: irradiance + static LLPointer<LLViewerFetchedTexture> sDefaultParticleImagep; // Default particle texture // not sure why, but something is iffy about the loading of this particular texture, use the accessor instead of accessing directly static LLPointer<LLViewerFetchedTexture> sSmokeImagep; // Old "Default" translucent texture |