summaryrefslogtreecommitdiff
path: root/indra/llcommon
diff options
context:
space:
mode:
authorSteven Bennetts <steve@lindenlab.com>2007-01-23 19:12:31 +0000
committerSteven Bennetts <steve@lindenlab.com>2007-01-23 19:12:31 +0000
commit7f50e28b0f3905f95299f7d5d63e0fd82e103bed (patch)
tree99c01f8184cc9a5ca90484661b30a8ac6dcd60f4 /indra/llcommon
parent47576ad1f77ecbe606fa1bd3addac610fad43dd7 (diff)
merge -r 56842:57026 maintenance.
Diffstat (limited to 'indra/llcommon')
-rw-r--r--indra/llcommon/llfasttimer.h6
1 files changed, 5 insertions, 1 deletions
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,