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

llrender and lldir merge. Removed duplicate assets from skins. cleaned up skin textures.xml files to only include changes from default.

Browse Source
This commit is contained in:
Shyotl
2016-04-11 02:51:08 -05:00
parent d40256fb31
commit be5d2f20bc
1280 changed files with 2354 additions and 10692 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
indra/llui/llui.cpp
View File

@@ -223,32 +223,33 @@ std::string LLUI::getLanguage()
//static
std::string LLUI::locateSkin(const std::string& filename)
{
std::string slash = gDirUtilp->getDirDelimiter();
std::string found_file = filename;
if (!gDirUtilp->fileExists(found_file))
if (gDirUtilp->fileExists(found_file))
{
found_file = gDirUtilp->getExpandedFilename(LL_PATH_USER_SETTINGS, filename); // Should be CUSTOM_SKINS?
return found_file;
}
if (sConfigGroup && sConfigGroup->controlExists("Language"))
found_file = gDirUtilp->getExpandedFilename(LL_PATH_USER_SETTINGS, filename); // Should be CUSTOM_SKINS?
if (gDirUtilp->fileExists(found_file))
{
if (!gDirUtilp->fileExists(found_file))
{
std::string localization = getLanguage();
std::string local_skin = "xui" + slash + localization + slash + filename;
found_file = gDirUtilp->findSkinnedFilename(local_skin);
}
return found_file;
}
if (!gDirUtilp->fileExists(found_file))
found_file = gDirUtilp->findSkinnedFilename(LLDir::XUI, filename);
if (! found_file.empty())
{
std::string local_skin = "xui" + slash + "en-us" + slash + filename;
found_file = gDirUtilp->findSkinnedFilename(local_skin);
return found_file;
}
if (!gDirUtilp->fileExists(found_file))
found_file = gDirUtilp->getExpandedFilename(LL_PATH_APP_SETTINGS, filename);
if (gDirUtilp->fileExists(found_file))
{
found_file = gDirUtilp->getExpandedFilename(LL_PATH_APP_SETTINGS, filename);
return found_file;
}
return found_file;
}
LL_WARNS("LLUI") << "Can't find '" << filename
<< "' in user settings, any skin directory or app_settings" << LL_ENDL;
return "";
}
//static
LLVector2 LLUI::getWindowSize()