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

Restoring preset loading

Browse Source
This commit is contained in:
Siana Gearz
2012-02-01 09:59:31 +01:00
parent 071745007a
commit 55cce46454
5 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
indra/newview/llwlparammanager.cpp
View File

@@ -284,10 +284,10 @@ void LLWLParamManager::refreshRegionPresets()
void LLWLParamManager::loadAllPresets()
{
// First, load system (coming out of the box) sky presets.
loadPresetsFromDir(getSysDir());
loadPresetsFromDir(gDirUtilp->getExpandedFilename(LL_PATH_APP_SETTINGS, "windlight/skies", ""));
// Then load user presets. Note that user day presets will modify any system ones already loaded.
loadPresetsFromDir(getUserDir());
loadPresetsFromDir(gDirUtilp->getExpandedFilename(LL_PATH_APP_SETTINGS, "windlight/skies", ""));
}
void LLWLParamManager::loadPresetsFromDir(const std::string& dir)
@@ -314,7 +314,7 @@ void LLWLParamManager::loadPresetsFromDir(const std::string& dir)
bool LLWLParamManager::loadPreset(const std::string& path)
{
llifstream xml_file;
std::string name(gDirUtilp->getBaseFileName(LLURI::unescape(path), /*strip_exten = */ true));
std::string name(LLURI::unescape(gDirUtilp->getBaseFileName(path, true)));
xml_file.open(path.c_str());
if (!xml_file)