diff options
| author | Oz Linden <oz@lindenlab.com> | 2016-04-29 10:52:43 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2016-04-29 10:52:43 -0400 |
| commit | f495ca8f1a5046efc4eb4dba00755d3518b580e7 (patch) | |
| tree | fc8025c7e6add4334751b65163f2be835d5fcd50 /indra/newview/llfeaturemanager.cpp | |
| parent | ff6d4b517f8f9bf1bfc9698e4cb7cf4ff5ff2646 (diff) | |
Adjust some avatar complexity defaults (mostly slightly upwards)
Make more settings between mac and windows the same
Remove solaris and xp featuretables, since we don't support them any more
Diffstat (limited to 'indra/newview/llfeaturemanager.cpp')
| -rw-r--r-- | indra/newview/llfeaturemanager.cpp | 19 |
1 files changed, 1 insertions, 18 deletions
diff --git a/indra/newview/llfeaturemanager.cpp b/indra/newview/llfeaturemanager.cpp index 063a3a521f..04da8f25cd 100644 --- a/indra/newview/llfeaturemanager.cpp +++ b/indra/newview/llfeaturemanager.cpp @@ -180,16 +180,14 @@ BOOL LLFeatureList::maskList(LLFeatureList &mask) void LLFeatureList::dump() { LL_DEBUGS("RenderInit") << "Feature list: " << mName << LL_ENDL; - LL_DEBUGS("RenderInit") << "--------------" << LL_ENDL; LLFeatureInfo fi; feature_map_t::iterator feature_it; for (feature_it = mFeatures.begin(); feature_it != mFeatures.end(); ++feature_it) { fi = feature_it->second; - LL_DEBUGS("RenderInit") << fi.mName << "\t\t" << fi.mAvailable << ":" << fi.mRecommendedLevel << LL_ENDL; + LL_DEBUGS("RenderInit") << "With " << mName << " feature " << fi.mName << " " << fi.mAvailable << ":" << fi.mRecommendedLevel << LL_ENDL; } - LL_DEBUGS("RenderInit") << LL_ENDL; } static const std::vector<std::string> sGraphicsLevelNames = boost::assign::list_of @@ -279,26 +277,11 @@ bool LLFeatureManager::loadFeatureTables() std::string filename; std::string http_filename; -#if LL_WINDOWS - std::string os_string = LLAppViewer::instance()->getOSInfo().getOSStringSimple(); - if (os_string.find("Microsoft Windows XP") == 0) - { - filename = llformat(FEATURE_TABLE_FILENAME, "_xp"); - http_filename = llformat(FEATURE_TABLE_VER_FILENAME, "_xp", LLVersionInfo::getVersion().c_str()); - } - else - { - filename = llformat(FEATURE_TABLE_FILENAME, ""); - http_filename = llformat(FEATURE_TABLE_VER_FILENAME, "", LLVersionInfo::getVersion().c_str()); - } -#else filename = FEATURE_TABLE_FILENAME; http_filename = llformat(FEATURE_TABLE_VER_FILENAME, LLVersionInfo::getVersion().c_str()); -#endif app_path += filename; - // second table is downloaded with HTTP - note that this will only be used on the run _after_ it is downloaded std::string http_path = gDirUtilp->getExpandedFilename(LL_PATH_USER_SETTINGS, http_filename); |