Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

No longer include llerrorlegacy.h. Updated llstl to include deletion utilites.

Browse Source
This commit is contained in:
Shyotl
2015-06-19 03:54:20 -05:00
parent 283f5298d5
commit 1c627317ec
634 changed files with 8200 additions and 12214 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
indra/newview/llfeaturemanager.cpp
View File

@@ -126,7 +126,7 @@ BOOL LLFeatureList::isFeatureAvailable(const std::string& name)
BOOL LLFeatureList::maskList(LLFeatureList &mask)
{
//llinfos << "Masking with " << mask.mName << llendl;
//LL_INFOS() << "Masking with " << mask.mName << LL_ENDL;
//
// Lookup the specified feature mask, and overlay it on top of the
// current feature mask.
@@ -234,7 +234,7 @@ BOOL LLFeatureManager::loadFeatureTables()
BOOL LLFeatureManager::parseFeatureTable(std::string filename)
{
llinfos << "Looking for feature table in " << filename << llendl;
LL_INFOS() << "Looking for feature table in " << filename << LL_ENDL;
llifstream file;
std::string name;
@@ -448,7 +448,7 @@ void LLFeatureManager::applyRecommendedSettings()
// cap the level at 2 (high)
S32 level = llmax(GPU_CLASS_0, llmin(mGPUClass, GPU_CLASS_2));
llinfos << "Applying Recommended Features" << llendl;
LL_INFOS() << "Applying Recommended Features" << LL_ENDL;
setGraphicsLevel(level, false);
gSavedSettings.setU32("RenderQualityPerformance", level);
@@ -495,7 +495,7 @@ void LLFeatureManager::applyFeatures(bool skipFeatures)
LLControlVariable* ctrl = gSavedSettings.getControl(mIt->first);
if(ctrl == NULL)
{
llwarns << "AHHH! Control setting " << mIt->first << " does not exist!" << llendl;
LL_WARNS() << "AHHH! Control setting " << mIt->first << " does not exist!" << LL_ENDL;
continue;
}
@@ -525,7 +525,7 @@ void LLFeatureManager::applyFeatures(bool skipFeatures)
}
else
{
llwarns << "AHHH! Control variable is not a numeric type!" << llendl;
LL_WARNS() << "AHHH! Control variable is not a numeric type!" << LL_ENDL;
}
}
}
@@ -672,7 +672,7 @@ void LLFeatureManager::applyBaseMasks()
}
}
//llinfos << "Masking features from gpu table match: " << gpustr << llendl;
//LL_INFOS() << "Masking features from gpu table match: " << gpustr << LL_ENDL;
maskFeatures(gpustr);
// now mask cpu type ones