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.h | |
| parent | 5c0e201cd61cf7b29b8871864c8fc7f90c82b5cd (diff) | |
| parent | 8eaee1f033d9dac892e749cc65416e149021d8f6 (diff) | |
SL-17703: Fix merge
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 a57886ff6f..312e2ca365 100644 --- a/indra/newview/llviewertexture.h +++ b/indra/newview/llviewertexture.h @@ -530,6 +530,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> sSmokeImagep; // Old "Default" translucent texture static LLPointer<LLViewerFetchedTexture> sFlatNormalImagep; // Flat normal map denoting no bumpiness on a surface + static LLPointer<LLViewerFetchedTexture> sDefaultIrradiancePBRp; // PBR: irradiance }; // |