diff options
| author | dolphin <dolphin@lindenlab.com> | 2014-05-07 11:14:26 -0700 |
|---|---|---|
| committer | dolphin <dolphin@lindenlab.com> | 2014-05-07 11:14:26 -0700 |
| commit | 48fece44737fa8b9614fd864354d9287a216ea33 (patch) | |
| tree | f68426d79f4631c6b49be142a92e59086870fa38 /indra/llrender/llgltexture.h | |
| parent | ae856ef31830912cec0f4de37167858a24e4ba30 (diff) | |
| parent | d0ef02c23a7a37c8c9bfe3a86bae88bb811fc9fe (diff) | |
Merge with 3.7.7-release
Diffstat (limited to 'indra/llrender/llgltexture.h')
| -rw-r--r-- | indra/llrender/llgltexture.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/llrender/llgltexture.h b/indra/llrender/llgltexture.h index e69b322d60..45592ee077 100644 --- a/indra/llrender/llgltexture.h +++ b/indra/llrender/llgltexture.h @@ -101,7 +101,7 @@ public: LLGLTexture(const LLImageRaw* raw, BOOL usemipmaps) ; LLGLTexture(const U32 width, const U32 height, const U8 components, BOOL usemipmaps) ; - virtual void dump(); // debug info to llinfos + virtual void dump(); // debug info to LL_INFOS() virtual const LLUUID& getID() const = 0; @@ -138,7 +138,7 @@ public: S32 getDiscardLevel() const; S8 getComponents() const; BOOL getBoundRecently() const; - S32 getTextureMemory() const ; + S32Bytes getTextureMemory() const ; LLGLenum getPrimaryFormat() const; BOOL getIsAlphaMask() const ; LLTexUnit::eTextureType getTarget(void) const ; |