summaryrefslogtreecommitdiff
path: root/indra/newview/llvoavatarself.h
diff options
context:
space:
mode:
authorDave Parks <davep@lindenlab.com>2011-09-26 19:27:10 -0500
committerDave Parks <davep@lindenlab.com>2011-09-26 19:27:10 -0500
commitbd02cdc75f1c752a127d1303527be3a96479af93 (patch)
treed8503b7c296a4cd4f1aa2954c03ff250beda4254 /indra/newview/llvoavatarself.h
parentd475a96e94be90e68cf34bf6c25d8ab259aa47b5 (diff)
parent8dbfa022778f2a7fcd5d2b527045724551279412 (diff)
merge
Diffstat (limited to 'indra/newview/llvoavatarself.h')
-rw-r--r--indra/newview/llvoavatarself.h3
1 files changed, 0 insertions, 3 deletions
diff --git a/indra/newview/llvoavatarself.h b/indra/newview/llvoavatarself.h
index 51f06dee5f..74ff47a3e4 100644
--- a/indra/newview/llvoavatarself.h
+++ b/indra/newview/llvoavatarself.h
@@ -249,10 +249,7 @@ public:
// Scratch textures (used for compositing)
//--------------------------------------------------------------------
public:
- BOOL bindScratchTexture(LLGLenum format);
static void deleteScratchTextures();
-protected:
- LLGLuint getScratchTexName(LLGLenum format, S32& components, U32* texture_bytes);
private:
static S32 sScratchTexBytes;
static LLMap< LLGLenum, LLGLuint*> sScratchTexNames;