summaryrefslogtreecommitdiff
path: root/indra/llrender/llgltexture.cpp
diff options
context:
space:
mode:
authorGraham Linden graham@lindenlab.com <Graham Linden graham@lindenlab.com>2018-04-18 18:11:25 +0100
committerGraham Linden graham@lindenlab.com <Graham Linden graham@lindenlab.com>2018-04-18 18:11:25 +0100
commit528ccdc97fae50f30b7606b8942ca953deec7c8a (patch)
tree225a2b778bd23bd704b3db71643d0d155d4d48ee /indra/llrender/llgltexture.cpp
parent4129657cc000fd997619594ab052f452f3a8382b (diff)
parent184ee74c39f5094283374e8aac714a6cd0fb4285 (diff)
Merge
Diffstat (limited to 'indra/llrender/llgltexture.cpp')
-rw-r--r--indra/llrender/llgltexture.cpp2
1 files changed, 1 insertions, 1 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; }