diff options
| author | Richard Linden <none@none> | 2013-12-02 14:57:29 -0800 |
|---|---|---|
| committer | Richard Linden <none@none> | 2013-12-02 14:57:29 -0800 |
| commit | 34ff2fc46ba8c623f0eab8fe1dccb5db327775a8 (patch) | |
| tree | 7bc422dd969e1d18e9d83e52a9a6dcfa2bd6139f /indra/llcommon/llprocessor.h | |
| parent | 787ccaf297e81291469aaf269f563d862fb150a3 (diff) | |
| parent | d8e92867162f8c4ff9489d8eefde53546e907dff (diff) | |
merge with release
Diffstat (limited to 'indra/llcommon/llprocessor.h')
| -rwxr-xr-x | indra/llcommon/llprocessor.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/indra/llcommon/llprocessor.h b/indra/llcommon/llprocessor.h index 6364d3c8bb..90e5bc59ee 100755 --- a/indra/llcommon/llprocessor.h +++ b/indra/llcommon/llprocessor.h @@ -27,6 +27,8 @@ #ifndef LLPROCESSOR_H #define LLPROCESSOR_H +#include "llunits.h" + class LLProcessorInfoImpl; class LL_COMMON_API LLProcessorInfo @@ -35,7 +37,7 @@ public: LLProcessorInfo(); ~LLProcessorInfo(); - F64 getCPUFrequency() const; + F64MegahertzImplicit getCPUFrequency() const; bool hasSSE() const; bool hasSSE2() const; bool hasAltivec() const; |