diff options
| author | Eli Linden <eli@lindenlab.com> | 2010-03-09 18:30:59 -0800 |
|---|---|---|
| committer | Eli Linden <eli@lindenlab.com> | 2010-03-09 18:30:59 -0800 |
| commit | 50abb9b972be65178bab5bc6ca247148febda140 (patch) | |
| tree | 3bc8dbc99fce70be49f82e812a7f908492e43bff /indra/newview/llviewertexture.h | |
| parent | 4562ae73f00fe27f1e06b9f4173774e4221e93d9 (diff) | |
| parent | 87213aa8ddd424242adfe2b7572168c7df8ba490 (diff) | |
Merge
Diffstat (limited to 'indra/newview/llviewertexture.h')
| -rw-r--r-- | indra/newview/llviewertexture.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llviewertexture.h b/indra/newview/llviewertexture.h index 6dc18085e0..a09a711cc7 100644 --- a/indra/newview/llviewertexture.h +++ b/indra/newview/llviewertexture.h @@ -300,7 +300,7 @@ public: static S32 sImageCount; static S32 sRawCount; static S32 sAuxCount; - static LLTimer sEvaluationTimer; + static LLFrameTimer sEvaluationTimer; static F32 sDesiredDiscardBias; static F32 sDesiredDiscardScale; static S32 sBoundTextureMemoryInBytes; |