diff options
| author | Richard Linden <none@none> | 2014-03-24 19:23:34 -0700 |
|---|---|---|
| committer | Richard Linden <none@none> | 2014-03-24 19:23:34 -0700 |
| commit | e5bbdafdeda0f2e6bbe97d59a24ca398b54c31eb (patch) | |
| tree | 359719c76abf090fb8cc5ae912ed013b64cb8fc7 /indra/llrender/llgltexture.cpp | |
| parent | 31a3a3da5db077c4d9b8fe06a18de98c822db6ab (diff) | |
| parent | 5b846ed2a6dce6c5801aa74d0f36a1c7525fbcba (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()) ; |