diff options
| author | Graham Linden graham@lindenlab.com <Graham Linden graham@lindenlab.com> | 2018-04-18 18:11:25 +0100 |
|---|---|---|
| committer | Graham Linden graham@lindenlab.com <Graham Linden graham@lindenlab.com> | 2018-04-18 18:11:25 +0100 |
| commit | 528ccdc97fae50f30b7606b8942ca953deec7c8a (patch) | |
| tree | 225a2b778bd23bd704b3db71643d0d155d4d48ee /indra/llrender | |
| parent | 4129657cc000fd997619594ab052f452f3a8382b (diff) | |
| parent | 184ee74c39f5094283374e8aac714a6cd0fb4285 (diff) | |
Merge
Diffstat (limited to 'indra/llrender')
| -rw-r--r-- | indra/llrender/llgltexture.cpp | 2 | ||||
| -rw-r--r-- | indra/llrender/lltexture.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/indra/llrender/llgltexture.cpp b/indra/llrender/llgltexture.cpp index c0e5477cea..e9a39d8acb 100644 --- a/indra/llrender/llgltexture.cpp +++ b/indra/llrender/llgltexture.cpp @@ -408,4 +408,4 @@ void LLGLTexture::setTexelsPerImage() static LLUUID sStubUUID; -const LLUUID& LLGLTexture::getID() const { return sStubUUID; }
\ No newline at end of file +const LLUUID& LLGLTexture::getID() const { return sStubUUID; } diff --git a/indra/llrender/lltexture.cpp b/indra/llrender/lltexture.cpp index 787a09a159..6eef36216c 100644 --- a/indra/llrender/lltexture.cpp +++ b/indra/llrender/lltexture.cpp @@ -40,4 +40,4 @@ S32 LLTexture::getWidth(S32 discard_level) const { llassert(false); return 0; } S32 LLTexture::getHeight(S32 discard_level) const { llassert(false); return 0; } bool LLTexture::isActiveFetching() { llassert(false); return false; } LLImageGL* LLTexture::getGLTexture() const { llassert(false); return nullptr; } -void LLTexture::updateBindStatsForTester() { }
\ No newline at end of file +void LLTexture::updateBindStatsForTester() { } |