diff options
| author | Graham Linden <graham@lindenlab.com> | 2019-05-08 11:42:31 -0700 |
|---|---|---|
| committer | Graham Linden <graham@lindenlab.com> | 2019-05-08 11:42:31 -0700 |
| commit | 605c9c19661702755171669e2af846abe77d2a51 (patch) | |
| tree | 8ab3bcd992c8167c1b9bdd9af074cd8acf39bcf7 /indra/newview/llviewertexture.h | |
| parent | b5055e890743783746a3691f14b81a6bc62f2bff (diff) | |
Fix merge fail.
Diffstat (limited to 'indra/newview/llviewertexture.h')
| -rw-r--r-- | indra/newview/llviewertexture.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llviewertexture.h b/indra/newview/llviewertexture.h index 78bebb542a..69568cc825 100644 --- a/indra/newview/llviewertexture.h +++ b/indra/newview/llviewertexture.h @@ -125,7 +125,7 @@ public: virtual BOOL isMissingAsset() const ; virtual void dump(); // debug info to LL_INFOS() - virtual BOOL isViewerMediaTexture() const { return false; } + virtual bool isViewerMediaTexture() const { return false; } /*virtual*/ bool bindDefaultImage(const S32 stage = 0) ; /*virtual*/ bool bindDebugImage(const S32 stage = 0) ; |