From 138bf1132262c479dbbd5c95195db46b1efd065f Mon Sep 17 00:00:00 2001
From: Richard Nelson <richard@lindenlab.com>
Date: Mon, 24 Aug 2009 20:04:52 +0000
Subject: merge -r 130399-131510 skinning-21 -> viewer-2.0.0-3

DEV-11254 DEV-11254 DEV-2003: DEV-21567 DEV-37301 EXT-104 EXT-138 EXT-217 EXT-256 EXT-259 EXT-259 EXT-328 EXT-348 EXT-386 EXT-399 EXT-403 EXT-460 EXT-492 EXT-492 EXT-531 EXT-537 EXT-684

improved text editor (handles multiple fonts simultaneously as well as inline widgets)
---
 indra/newview/llhudobject.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'indra/newview/llhudobject.cpp')

diff --git a/indra/newview/llhudobject.cpp b/indra/newview/llhudobject.cpp
index bdff492948..dc55aba0db 100644
--- a/indra/newview/llhudobject.cpp
+++ b/indra/newview/llhudobject.cpp
@@ -254,10 +254,12 @@ LLHUDEffect *LLHUDObject::addHUDEffect(const U8 type)
 	return hud_objectp;
 }
 
+static LLFastTimer::DeclareTimer FTM_HUD_UPDATE("Update Hud");
+
 // static
 void LLHUDObject::updateAll()
 {
-	LLFastTimer ftm(LLFastTimer::FTM_HUD_UPDATE);
+	LLFastTimer ftm(FTM_HUD_UPDATE);
 	LLHUDText::updateAll();
 	LLHUDIcon::updateAll();
 	sortObjects();
-- 
cgit v1.2.3