diff options
| author | Oz Linden <oz@lindenlab.com> | 2012-11-19 11:09:58 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2012-11-19 11:09:58 -0500 |
| commit | b7f8a2479249646c7fb38ead195d5197ab733c94 (patch) | |
| tree | c1bf4a2b0ecac69a4705827a042ea7f0224ebc54 /indra/llrender/llimagegl.cpp | |
| parent | c94756d92c7353cb91bfddb5e342f825457e1a7e (diff) | |
| parent | f8749ec9bd03072cc5b50f4cb1a61289b2989c72 (diff) | |
merge up to 3.4.1-release
Diffstat (limited to 'indra/llrender/llimagegl.cpp')
| -rw-r--r-- | indra/llrender/llimagegl.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/indra/llrender/llimagegl.cpp b/indra/llrender/llimagegl.cpp index 659d3ca409..a842211764 100644 --- a/indra/llrender/llimagegl.cpp +++ b/indra/llrender/llimagegl.cpp @@ -237,9 +237,11 @@ S32 LLImageGL::dataFormatComponents(S32 dataformat) //---------------------------------------------------------------------------- +static LLFastTimer::DeclareTimer FTM_IMAGE_UPDATE_STATS("Image Stats"); // static void LLImageGL::updateStats(F32 current_time) { + LLFastTimer t(FTM_IMAGE_UPDATE_STATS); sLastFrameTime = current_time; sBoundTextureMemoryInBytes = sCurBoundTextureMemory; sCurBoundTextureMemory = 0; |