Merge branch 'master' of https://github.com/siana/SingularityViewer

2011-05-05 15:54:21 +02:00
parent 92696623e0 eedc1f79ec
commit 0fa396938b
23 changed files with 132 additions and 299 deletions
--- a/indra/llcommon/llfasttimer.h
+++ b/indra/llcommon/llfasttimer.h
@@ -54,6 +54,7 @@ public:
 		// common messaging components
 		FTM_PUMP,
 		FTM_CURL,
+		FTM_PUMPIO,
 		
 		// common simulation components
 		FTM_UPDATE_ANIMATION,