diff options
author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2010-04-19 13:53:57 -0400 |
---|---|---|
committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2010-04-19 13:53:57 -0400 |
commit | 7f0a7789903809d489e9f85575be18c88df1ea98 (patch) | |
tree | 1aa3428c097ef8e19f1e518eb2e3e6996d16a2bc /indra/llcommon/lltimer.cpp | |
parent | aa5e494e0cf1242dcd35725576667ab1a935363a (diff) | |
parent | 1c352ebb5bfda6d53c844dca130302b79b918796 (diff) |
merge
Diffstat (limited to 'indra/llcommon/lltimer.cpp')
-rw-r--r-- | indra/llcommon/lltimer.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llcommon/lltimer.cpp b/indra/llcommon/lltimer.cpp index 25b768079b..6111db2bfa 100644 --- a/indra/llcommon/lltimer.cpp +++ b/indra/llcommon/lltimer.cpp @@ -209,7 +209,7 @@ F64 calc_clock_frequency(U32 uiMeasureMSecs) // Both Linux and Mac use gettimeofday for accurate time F64 calc_clock_frequency(unsigned int uiMeasureMSecs) { - return 1000000.0; // microseconds, so 1 Mhz. + return 1000000.0; // microseconds, so 1 MHz. } U64 get_clock_count() |