1 files changed, 7 insertions, 0 deletions

diff --git a/linden/indra/newview/llfeaturemanager.cpp b/linden/indra/newview/llfeaturemanager.cpp
index 2a30680..8bcbc1e 100644
--- a/linden/indra/newview/llfeaturemanager.cpp
+++ b/linden/indra/newview/llfeaturemanager.cpp
@@ -62,6 +62,8 @@ extern void write_debug(const std::string& str);
 const char FEATURE_TABLE_FILENAME[] = "featuretable_mac.txt";
 #elif LL_LINUX
 const char FEATURE_TABLE_FILENAME[] = "featuretable_linux.txt";
+#elif LL_SOLARIS
+const char FEATURE_TABLE_FILENAME[] = "featuretable_solaris.txt";
 #else
 const char FEATURE_TABLE_FILENAME[] = "featuretable.txt";
 #endif
@@ -405,7 +407,12 @@ void LLFeatureManager::initCPUFeatureMasks()
                 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");
         }