diff options
| author | Richard Linden <none@none> | 2013-06-17 01:20:27 -0700 |
|---|---|---|
| committer | Richard Linden <none@none> | 2013-06-17 01:20:27 -0700 |
| commit | 1cb0c974ae410479a1f72dab556ef7c9371970ee (patch) | |
| tree | 91a97b4b05e8085fdad17173b7ca874bb98a8805 /indra/llrender/llimagegl.cpp | |
| parent | fc88265cffe3553803314c6e895a1e3a3c988171 (diff) | |
| parent | 3f2de87340b1c831ea59e4a3ca960d49f343c9fd (diff) | |
Merge
Diffstat (limited to 'indra/llrender/llimagegl.cpp')
| -rw-r--r-- | indra/llrender/llimagegl.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/llrender/llimagegl.cpp b/indra/llrender/llimagegl.cpp index 2c3fcfcec1..cb99a651c6 100644 --- a/indra/llrender/llimagegl.cpp +++ b/indra/llrender/llimagegl.cpp @@ -51,9 +51,9 @@ U32 wpo2(U32 i); U32 LLImageGL::sUniqueCount = 0; U32 LLImageGL::sBindCount = 0; -LLUnit<LLUnits::Bytes, S32> LLImageGL::sGlobalTextureMemory = 0; -LLUnit<LLUnits::Bytes, S32> LLImageGL::sBoundTextureMemory = 0; -LLUnit<LLUnits::Bytes, S32> LLImageGL::sCurBoundTextureMemory = 0; +LLUnit<S32, LLUnits::Bytes> LLImageGL::sGlobalTextureMemory = 0; +LLUnit<S32, LLUnits::Bytes> LLImageGL::sBoundTextureMemory = 0; +LLUnit<S32, LLUnits::Bytes> LLImageGL::sCurBoundTextureMemory = 0; S32 LLImageGL::sCount = 0; LLImageGL::dead_texturelist_t LLImageGL::sDeadTextureList[LLTexUnit::TT_NONE]; U32 LLImageGL::sCurTexName = 1; |