diff options
| author | Richard Linden <none@none> | 2013-11-19 17:40:44 -0800 |
|---|---|---|
| committer | Richard Linden <none@none> | 2013-11-19 17:40:44 -0800 |
| commit | 391ac367d6922f30bf3a186bc15e1fc38366eecf (patch) | |
| tree | ca318051118f3e264ef424167c7a377445500f06 /indra/newview/llviewertexturelist.cpp | |
| parent | a868b7ed41d8b7d04ae47490564cdc35bcfbac1a (diff) | |
SH-4634 FIX Interesting: Viewer crashes when receiving teleport offer
renamed fast timers to have unique names, changes instance tracker to never allow duplicates
Diffstat (limited to 'indra/newview/llviewertexturelist.cpp')
| -rwxr-xr-x | indra/newview/llviewertexturelist.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llviewertexturelist.cpp b/indra/newview/llviewertexturelist.cpp index 99903bfdf3..b98726900f 100755 --- a/indra/newview/llviewertexturelist.cpp +++ b/indra/newview/llviewertexturelist.cpp @@ -670,11 +670,11 @@ static LLTrace::BlockTimerStatHandle FTM_IMAGE_FETCH("Fetch"); static LLTrace::BlockTimerStatHandle FTM_FAST_CACHE_IMAGE_FETCH("Fast Cache Fetch"); static LLTrace::BlockTimerStatHandle FTM_IMAGE_CREATE("Create"); static LLTrace::BlockTimerStatHandle FTM_IMAGE_STATS("Stats"); -static LLTrace::BlockTimerStatHandle FTM_UPDATE_IMAGES("Update Images"); +static LLTrace::BlockTimerStatHandle FTM_UPDATE_TEXTURES("Update Textures"); void LLViewerTextureList::updateImages(F32 max_time) { - LL_RECORD_BLOCK_TIME(FTM_UPDATE_IMAGES); + LL_RECORD_BLOCK_TIME(FTM_UPDATE_TEXTURES); static BOOL cleared = FALSE; if(gTeleportDisplay) { |