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/newview/llfeaturemanager.cpp | |
| parent | a1a43f7942f68e75eaadaa9c5280ac196c4ed6a7 (diff) | |
| parent | 7f0a7789903809d489e9f85575be18c88df1ea98 (diff) | |
Merge
Diffstat (limited to 'indra/newview/llfeaturemanager.cpp')
| -rw-r--r-- | indra/newview/llfeaturemanager.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llfeaturemanager.cpp b/indra/newview/llfeaturemanager.cpp index fbb90c69f3..50b08f782a 100644 --- a/indra/newview/llfeaturemanager.cpp +++ b/indra/newview/llfeaturemanager.cpp @@ -621,9 +621,9 @@ void LLFeatureManager::applyBaseMasks() #if LL_SOLARIS && defined(__sparc) // even low MHz SPARCs are fast #error The 800 is hinky. Would something like a LL_MIN_MHZ make more sense here? - if (gSysCPU.getMhz() < 800) + if (gSysCPU.getMHz() < 800) #else - if (gSysCPU.getMhz() < 1100) + if (gSysCPU.getMHz() < 1100) #endif { maskFeatures("CPUSlow"); |