aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/llcommon/lltimer.h
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--linden/indra/llcommon/lltimer.h5
1 files changed, 4 insertions, 1 deletions
diff --git a/linden/indra/llcommon/lltimer.h b/linden/indra/llcommon/lltimer.h
index 8d94276..766645b 100644
--- a/linden/indra/llcommon/lltimer.h
+++ b/linden/indra/llcommon/lltimer.h
@@ -39,6 +39,8 @@
39 39
40#include "stdtypes.h" 40#include "stdtypes.h"
41 41
42#include <string>
43#include <list>
42// units conversions 44// units conversions
43#ifndef USEC_PER_SEC 45#ifndef USEC_PER_SEC
44 const U32 USEC_PER_SEC = 1000000; 46 const U32 USEC_PER_SEC = 1000000;
@@ -115,6 +117,7 @@ void update_clock_frequencies();
115 117
116// Sleep for milliseconds 118// Sleep for milliseconds
117void ms_sleep(U32 ms); 119void ms_sleep(U32 ms);
120U32 micro_sleep(U64 us, U32 max_yields = 0xFFFFFFFF);
118 121
119// Returns the correct UTC time in seconds, like time(NULL). 122// Returns the correct UTC time in seconds, like time(NULL).
120// Useful on the viewer, which may have its local clock set wrong. 123// Useful on the viewer, which may have its local clock set wrong.
@@ -184,7 +187,7 @@ protected:
184 187
185private: 188private:
186 //list of active timers 189 //list of active timers
187 static std::list<LLEventTimer*> sActiveList; 190 static std::list<LLEventTimer*> sActiveList; // TODO should this be a vector
188}; 191};
189 192
190#endif 193#endif