diff options
| author | Eli Linden <eli@lindenlab.com> | 2010-04-19 12:53:59 -0700 |
|---|---|---|
| committer | Eli Linden <eli@lindenlab.com> | 2010-04-19 12:53:59 -0700 |
| commit | 5f80e5681c7a0e9f0fc5889ede435c79358fc639 (patch) | |
| tree | ee9e5826ee220a971aa7990ef83a64644bf644d9 /indra/llcommon/lltimer.cpp | |
| parent | a1a43f7942f68e75eaadaa9c5280ac196c4ed6a7 (diff) | |
| parent | 7f0a7789903809d489e9f85575be18c88df1ea98 (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() |