diff options
| author | Richard Linden <none@none> | 2013-08-19 10:20:55 -0700 |
|---|---|---|
| committer | Richard Linden <none@none> | 2013-08-19 10:20:55 -0700 |
| commit | 08eb52c10ca1f916d937fe1927eb659f6d69a6d3 (patch) | |
| tree | 98e7faecca7ded1dd8732dfef7c13abd424b858b /indra/llrender/llgltexture.cpp | |
| parent | 4290365ebbf5505bee4fbed8043996fa7687fd03 (diff) | |
| parent | 612892b45a3413b16e40c49d3bfde77a4ca927fd (diff) | |
merge
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()) ; |