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/llhudmanager.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/llhudmanager.cpp')
| -rwxr-xr-x | indra/newview/llhudmanager.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llhudmanager.cpp b/indra/newview/llhudmanager.cpp index 6b6d7d7e7f..1f9b0f47b1 100755 --- a/indra/newview/llhudmanager.cpp +++ b/indra/newview/llhudmanager.cpp @@ -54,11 +54,11 @@ LLHUDManager::~LLHUDManager() { } -static LLTrace::BlockTimerStatHandle FTM_HUD_EFFECTS("Hud Effects"); +static LLTrace::BlockTimerStatHandle FTM_UPDATE_HUD_EFFECTS("Update Hud Effects"); void LLHUDManager::updateEffects() { - LL_RECORD_BLOCK_TIME(FTM_HUD_EFFECTS); + LL_RECORD_BLOCK_TIME(FTM_UPDATE_HUD_EFFECTS); S32 i; for (i = 0; i < mHUDEffects.size(); i++) { |