summaryrefslogtreecommitdiff
path: root/indra/newview/llviewertexture.h
diff options
context:
space:
mode:
authorJames Cook <james@lindenlab.com>2010-06-01 14:33:44 -0700
committerJames Cook <james@lindenlab.com>2010-06-01 14:33:44 -0700
commit49c221b9678c33d5dbe71a68ca35d0b28fff3edd (patch)
tree0214531fe7d433a220240b766d928f7a49e2ed92 /indra/newview/llviewertexture.h
parent010dba68ad923cf66b1e05e6969a21f7288fe78a (diff)
parent7ea46b968cf7df3afc1e879f90f1124157f5a79d (diff)
Merge with dessie/viewer-public in prep to land code there
Diffstat (limited to 'indra/newview/llviewertexture.h')
-rw-r--r--indra/newview/llviewertexture.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llviewertexture.h b/indra/newview/llviewertexture.h
index 74c46f3070..1bd4cc793d 100644
--- a/indra/newview/llviewertexture.h
+++ b/indra/newview/llviewertexture.h
@@ -293,8 +293,8 @@ protected:
INACTIVE, //not be used for the last certain period (i.e., 30 seconds).
ACTIVE, //just being used, can become inactive if not being used for a certain time (10 seconds).
NO_DELETE = 99 //stay in memory, can not be removed.
- } LLGLTexureState;
- LLGLTexureState mTextureState ;
+ } LLGLTextureState;
+ LLGLTextureState mTextureState ;
public:
static const U32 sCurrentFileVersion;