diff options
| author | Richard Linden <none@none> | 2014-02-19 12:32:08 -0800 |
|---|---|---|
| committer | Richard Linden <none@none> | 2014-02-19 12:32:08 -0800 |
| commit | ef591d280eb3c5bae7da20540ad4cbb30858d0aa (patch) | |
| tree | ff387e884e25eaa8a47adff4110ce02edfe67387 /indra/llrender/llgltexture.cpp | |
| parent | ce7e19d33a74e89059c2196da9c439d0eb9b21c1 (diff) | |
| parent | 6661628d5c68855ddffc54a3f2578f93ada84de1 (diff) | |
Merge with release
Diffstat (limited to 'indra/llrender/llgltexture.cpp')
| -rw-r--r-- | indra/llrender/llgltexture.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llrender/llgltexture.cpp b/indra/llrender/llgltexture.cpp index d06ed5e57b..56e263c5f1 100644 --- a/indra/llrender/llgltexture.cpp +++ b/indra/llrender/llgltexture.cpp @@ -294,7 +294,7 @@ LLTexUnit::eTextureAddressMode LLGLTexture::getAddressMode(void) const return mGLTexturep->getAddressMode() ; } -S32 LLGLTexture::getTextureMemory() const +S32Bytes LLGLTexture::getTextureMemory() const { llassert(mGLTexturep.notNull()) ; |