From 7f50e28b0f3905f95299f7d5d63e0fd82e103bed Mon Sep 17 00:00:00 2001
From: Steven Bennetts <steve@lindenlab.com>
Date: Tue, 23 Jan 2007 19:12:31 +0000
Subject: merge -r 56842:57026 maintenance.

---
 indra/llcommon/llfasttimer.h | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'indra/llcommon')

diff --git a/indra/llcommon/llfasttimer.h b/indra/llcommon/llfasttimer.h
index b5d7f8adc8..2fde728eaf 100644
--- a/indra/llcommon/llfasttimer.h
+++ b/indra/llcommon/llfasttimer.h
@@ -28,7 +28,11 @@ public:
 		FTM_IDLE,
 		FTM_SLEEP,
 
-		// common simulate components
+		// common messaging components
+		FTM_PUMP,
+		FTM_CURL,
+		
+		// common simulation components
 		FTM_UPDATE_ANIMATION,
 		FTM_UPDATE_TERRAIN,
 		FTM_UPDATE_PRIMITIVES,
-- 
cgit v1.2.3