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

[PPE] Preset overrides go in user settings now

Browse Source
This commit is contained in:
Lirusaito
2019-03-08 13:49:51 -05:00
parent 4ddac28142
commit 26a7de79c7
1 changed files with 12 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
indra/llrender/llpostprocess.cpp
View File

@@ -355,17 +355,19 @@ LLPostProcess::LLPostProcess(void) :
mShaders.push_back(new LLPosterizeShader()); mShaders.push_back(new LLPosterizeShader());
/* Do nothing. Needs to be updated to use our current shader system, and to work with the move into llrender.*/ /* Do nothing. Needs to be updated to use our current shader system, and to work with the move into llrender.*/
std::string pathName(gDirUtilp->getExpandedFilename(LL_PATH_APP_SETTINGS, "windlight", XML_FILENAME)); auto load_effects = [&](const std::string& pathName)
LL_DEBUGS("AppInit", "Shaders") << "Loading PostProcess Effects settings from " << pathName << LL_ENDL;
llifstream effectsXML(pathName);
if (effectsXML)
{ {
LLPointer<LLSDParser> parser = new LLSDXMLParser(); LL_DEBUGS("AppInit", "Shaders") << "Loading PostProcess Effects settings from " << pathName << LL_ENDL;
llifstream effectsXML(pathName);
parser->parse(effectsXML, mAllEffectInfo, LLSDSerialize::SIZE_UNLIMITED); if (effectsXML)
} {
LLPointer<LLSDParser> parser = new LLSDXMLParser();
parser->parse(effectsXML, mAllEffectInfo, LLSDSerialize::SIZE_UNLIMITED);
}
};
load_effects(gDirUtilp->getExpandedFilename(LL_PATH_APP_SETTINGS, "windlight", XML_FILENAME));
load_effects(gDirUtilp->getExpandedFilename(LL_PATH_USER_SETTINGS, "windlight", XML_FILENAME));
// Singu TODO: Make this configurable via settings // Singu TODO: Make this configurable via settings
if (!mAllEffectInfo.has("Default")) if (!mAllEffectInfo.has("Default"))
@@ -705,7 +707,7 @@ void LLPostProcess::saveEffectAs(std::string const & effectName)
mAllEffectInfo[effectName] = mSelectedEffectInfo; mAllEffectInfo[effectName] = mSelectedEffectInfo;
mSelectedEffectChanged(mSelectedEffectName); // Might've changed, either way update the lists mSelectedEffectChanged(mSelectedEffectName); // Might've changed, either way update the lists
std::string pathName(gDirUtilp->getExpandedFilename(LL_PATH_APP_SETTINGS, "windlight", XML_FILENAME)); std::string pathName(gDirUtilp->getExpandedFilename(LL_PATH_USER_SETTINGS, "windlight", XML_FILENAME));
//LL_INFOS() << "Saving PostProcess Effects settings to " << pathName << LL_ENDL; //LL_INFOS() << "Saving PostProcess Effects settings to " << pathName << LL_ENDL;
llofstream effectsXML(pathName); llofstream effectsXML(pathName);