diff options
Diffstat (limited to 'linden/indra/newview')
-rw-r--r-- | linden/indra/newview/llappviewer.cpp | 4 | ||||
-rw-r--r-- | linden/indra/newview/llfeaturemanager.cpp | 2 | ||||
-rw-r--r-- | linden/indra/newview/llviewerjoystick.cpp | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/linden/indra/newview/llappviewer.cpp b/linden/indra/newview/llappviewer.cpp index 268c4c0..0eaecb1 100644 --- a/linden/indra/newview/llappviewer.cpp +++ b/linden/indra/newview/llappviewer.cpp | |||
@@ -859,7 +859,7 @@ bool LLAppViewer::init() | |||
859 | minSpecs += "\n"; | 859 | minSpecs += "\n"; |
860 | unsupported = true; | 860 | unsupported = true; |
861 | } | 861 | } |
862 | if(gSysCPU.getMhz() < minCPU) | 862 | if(gSysCPU.getMHz() < minCPU) |
863 | { | 863 | { |
864 | minSpecs += LLNotifications::instance().getGlobalString("UnsupportedCPU"); | 864 | minSpecs += LLNotifications::instance().getGlobalString("UnsupportedCPU"); |
865 | minSpecs += "\n"; | 865 | minSpecs += "\n"; |
@@ -2468,7 +2468,7 @@ void LLAppViewer::writeSystemInfo() | |||
2468 | 2468 | ||
2469 | gDebugInfo["CPUInfo"]["CPUString"] = gSysCPU.getCPUString(); | 2469 | gDebugInfo["CPUInfo"]["CPUString"] = gSysCPU.getCPUString(); |
2470 | gDebugInfo["CPUInfo"]["CPUFamily"] = gSysCPU.getFamily(); | 2470 | gDebugInfo["CPUInfo"]["CPUFamily"] = gSysCPU.getFamily(); |
2471 | gDebugInfo["CPUInfo"]["CPUMhz"] = gSysCPU.getMhz(); | 2471 | gDebugInfo["CPUInfo"]["CPUMhz"] = gSysCPU.getMHz(); |
2472 | gDebugInfo["CPUInfo"]["CPUAltivec"] = gSysCPU.hasAltivec(); | 2472 | gDebugInfo["CPUInfo"]["CPUAltivec"] = gSysCPU.hasAltivec(); |
2473 | gDebugInfo["CPUInfo"]["CPUSSE"] = gSysCPU.hasSSE(); | 2473 | gDebugInfo["CPUInfo"]["CPUSSE"] = gSysCPU.hasSSE(); |
2474 | gDebugInfo["CPUInfo"]["CPUSSE2"] = gSysCPU.hasSSE2(); | 2474 | gDebugInfo["CPUInfo"]["CPUSSE2"] = gSysCPU.hasSSE2(); |
diff --git a/linden/indra/newview/llfeaturemanager.cpp b/linden/indra/newview/llfeaturemanager.cpp index bf43fcf..25942e9 100644 --- a/linden/indra/newview/llfeaturemanager.cpp +++ b/linden/indra/newview/llfeaturemanager.cpp | |||
@@ -617,7 +617,7 @@ void LLFeatureManager::applyBaseMasks() | |||
617 | #error The 800 is hinky. Would something like a LL_MIN_MHZ make more sense here? | 617 | #error The 800 is hinky. Would something like a LL_MIN_MHZ make more sense here? |
618 | if (gSysCPU.getMhz() < 800) | 618 | if (gSysCPU.getMhz() < 800) |
619 | #else | 619 | #else |
620 | if (gSysCPU.getMhz() < 1100) | 620 | if (gSysCPU.getMHz() < 1100) |
621 | #endif | 621 | #endif |
622 | { | 622 | { |
623 | maskFeatures("CPUSlow"); | 623 | maskFeatures("CPUSlow"); |
diff --git a/linden/indra/newview/llviewerjoystick.cpp b/linden/indra/newview/llviewerjoystick.cpp index 4e509c7..675feb6 100644 --- a/linden/indra/newview/llviewerjoystick.cpp +++ b/linden/indra/newview/llviewerjoystick.cpp | |||
@@ -162,7 +162,7 @@ LLViewerJoystick::LLViewerJoystick() | |||
162 | memset(mBtn, 0, sizeof(mBtn)); | 162 | memset(mBtn, 0, sizeof(mBtn)); |
163 | 163 | ||
164 | // factor in bandwidth? bandwidth = gViewerStats->mKBitStat | 164 | // factor in bandwidth? bandwidth = gViewerStats->mKBitStat |
165 | mPerfScale = 4000.f / gSysCPU.getMhz(); | 165 | mPerfScale = 4000.f / gSysCPU.getMHz(); |
166 | } | 166 | } |
167 | 167 | ||
168 | // ----------------------------------------------------------------------------- | 168 | // ----------------------------------------------------------------------------- |