diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-05-29 06:23:49 +0100 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-05-29 06:23:49 +0100 |
| commit | 755f4db5e6a89c20fabc3776601bdb5e5e6a0fc0 (patch) | |
| tree | 0a235c788cb74bd32bc5b173e24c7b73ee63c05f /indra/newview/llviewertexture.h | |
| parent | 0ca09bea5ddfbb41e29fcc2b36e46c7e86171198 (diff) | |
| parent | 1ec70d45e4c8baf3467a97558f4300dcad38fc2a (diff) | |
merge
Diffstat (limited to 'indra/newview/llviewertexture.h')
| -rw-r--r-- | indra/newview/llviewertexture.h | 4 |
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; |