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

8
indra/newview/llwaterparammanager.cpp
View File

@@ -108,7 +108,7 @@ void LLWaterParamManager::loadAllPresets()
void LLWaterParamManager::loadPresetsFromDir(const std::string& dir)
{
LL_INFOS2("AppInit", "Shaders") << "Loading water presets from " << dir << LL_ENDL;
LL_INFOS("AppInit", "Shaders") << "Loading water presets from " << dir << LL_ENDL;
LLDirIterator dir_iter(dir, "*.xml");
while (1)
@@ -122,7 +122,7 @@ void LLWaterParamManager::loadPresetsFromDir(const std::string& dir)
std::string path = dir + file;
if (!loadPreset(path))
{
llwarns << "Error loading water preset from " << path << llendl;
LL_WARNS() << "Error loading water preset from " << path << LL_ENDL;
}
}
}
@@ -138,7 +138,7 @@ bool LLWaterParamManager::loadPreset(const std::string& path)
return false;
}
LL_DEBUGS2("AppInit", "Shaders") << "Loading water " << name << LL_ENDL;
LL_DEBUGS("AppInit", "Shaders") << "Loading water " << name << LL_ENDL;
LLSD params_data;
LLPointer<LLSDParser> parser = new LLSDXMLParser();
@@ -333,7 +333,7 @@ void LLWaterParamManager::applyParams(const LLSD& params, bool interpolate)
{
if (params.size() == 0)
{
llwarns << "Undefined water params" << llendl;
LL_WARNS() << "Undefined water params" << LL_ENDL;
return;
}