aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview/lldynamictexture.h
diff options
context:
space:
mode:
authorMcCabe Maxsted2009-06-07 23:14:43 -0700
committerMcCabe Maxsted2009-06-07 23:14:43 -0700
commite0a70bea805cf07b92efabca15ffe56a777f90ac (patch)
tree2c93d38e210832e737d09cff7561373d8d5453b2 /linden/indra/newview/lldynamictexture.h
parent1.1 version final (diff)
parentMerge branch 'sl-base-1.22' into next (diff)
downloadmeta-impy-e0a70bea805cf07b92efabca15ffe56a777f90ac.zip
meta-impy-e0a70bea805cf07b92efabca15ffe56a777f90ac.tar.gz
meta-impy-e0a70bea805cf07b92efabca15ffe56a777f90ac.tar.bz2
meta-impy-e0a70bea805cf07b92efabca15ffe56a777f90ac.tar.xz
Moved base up to 1.22
Diffstat (limited to 'linden/indra/newview/lldynamictexture.h')
-rw-r--r--linden/indra/newview/lldynamictexture.h9
1 files changed, 6 insertions, 3 deletions
diff --git a/linden/indra/newview/lldynamictexture.h b/linden/indra/newview/lldynamictexture.h
index 6069940..bd4d22b 100644
--- a/linden/indra/newview/lldynamictexture.h
+++ b/linden/indra/newview/lldynamictexture.h
@@ -4,7 +4,7 @@
4 * 4 *
5 * $LicenseInfo:firstyear=2002&license=viewergpl$ 5 * $LicenseInfo:firstyear=2002&license=viewergpl$
6 * 6 *
7 * Copyright (c) 2002-2008, Linden Research, Inc. 7 * Copyright (c) 2002-2009, Linden Research, Inc.
8 * 8 *
9 * Second Life Viewer Source Code 9 * Second Life Viewer Source Code
10 * The source code in this file ("Source Code") is provided by Linden Lab 10 * The source code in this file ("Source Code") is provided by Linden Lab
@@ -60,8 +60,11 @@ public:
60 virtual void preRender(BOOL clear_depth = TRUE); 60 virtual void preRender(BOOL clear_depth = TRUE);
61 virtual BOOL render(); 61 virtual BOOL render();
62 virtual void postRender(BOOL success); 62 virtual void postRender(BOOL success);
63 virtual void bindTexture(); 63
64 virtual void unbindTexture(); 64 virtual void restoreGLTexture() ;
65 virtual void destroyGLTexture() ;
66
67 LLImageGL* getTexture(void) const { return mTexture; }
65 68
66 static BOOL updateAllInstances(); 69 static BOOL updateAllInstances();
67 70