diff options
| author | Steve Bennetts <steve@lindenlab.com> | 2009-11-06 12:20:52 -0800 |
|---|---|---|
| committer | Steve Bennetts <steve@lindenlab.com> | 2009-11-06 12:20:52 -0800 |
| commit | 0db73b1ac58650bf681803c93767c64c3d908e15 (patch) | |
| tree | cba28950adfcf3b8040f1bc7cf449ddab6379b85 /indra/newview/llvoavatarself.h | |
| parent | 5b5df4769773025978409590e14a807ea2790c84 (diff) | |
| parent | afe6350160aa93323a6a5d8ef8c6206bffc337e0 (diff) | |
merge
Diffstat (limited to 'indra/newview/llvoavatarself.h')
| -rw-r--r-- | indra/newview/llvoavatarself.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llvoavatarself.h b/indra/newview/llvoavatarself.h index 6e52b33634..8a66422c44 100644 --- a/indra/newview/llvoavatarself.h +++ b/indra/newview/llvoavatarself.h @@ -241,7 +241,7 @@ public: BOOL bindScratchTexture(LLGLenum format); static void deleteScratchTextures(); protected: - LLGLuint getScratchTexName(LLGLenum format, U32* texture_bytes); + LLGLuint getScratchTexName(LLGLenum format, S32& components, U32* texture_bytes); private: static S32 sScratchTexBytes; static LLMap< LLGLenum, LLGLuint*> sScratchTexNames; |