diff options
| author | Dave Houlton <euclid@lindenlab.com> | 2020-10-09 19:50:51 +0000 |
|---|---|---|
| committer | Dave Houlton <euclid@lindenlab.com> | 2020-10-09 19:50:51 +0000 |
| commit | 846fc179b13ba06fe9a51be69d80e86d0f433a73 (patch) | |
| tree | 2061ad71bfdf04be832d8213b3fee643e6aec2ca /indra/newview/llfeaturemanager.cpp | |
| parent | 18ddd70d96dc572ad94c81f9a1a3d08d7c7cdbc7 (diff) | |
| parent | 7cd076c796126692c308df5416b42b24a96609fb (diff) | |
Merged in euclid-desolarisify (pull request #335)
DRTVWR-510 remove all LL_SOLARIS conditional code
Approved-by: Andrey Kleshchev
Approved-by: Michael Pohoreski
Diffstat (limited to 'indra/newview/llfeaturemanager.cpp')
| -rw-r--r-- | indra/newview/llfeaturemanager.cpp | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/indra/newview/llfeaturemanager.cpp b/indra/newview/llfeaturemanager.cpp index d915a9fd26..2d4478aff5 100644 --- a/indra/newview/llfeaturemanager.cpp +++ b/indra/newview/llfeaturemanager.cpp @@ -771,12 +771,7 @@ void LLFeatureManager::applyBaseMasks() maskFeatures("RAM256MB"); } -#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) -#else if (gSysCPU.getMHz() < 1100) -#endif { maskFeatures("CPUSlow"); } |