livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merged with tip

Kitty Barnett 2013-01-03 22:28:20 +01:00
parent fd67a51a7b 86ed867f4d
commit ef4d1d8fa2
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
indra/llvfs/lldir.cpp
View File

@ -936,6 +936,7 @@ void LLDir::setSkinFolder(const std::string &skin_folder, const std::string& the
if (!theme_folder.empty())
{
mSkinThemeDir = getSkinDir();
append(mSkinThemeDir, "themes");
append(mSkinThemeDir, theme_folder);
// Next level of generality is a specific theme for the current skin
addSearchSkinDir(mSkinThemeDir);

2
indra/newview/llfloaterpreference.cpp
View File

@ -2869,7 +2869,7 @@ void LLPanelPreferenceSkins::refreshSkinThemeList()
gDirUtilp->append(strPath, sdSkin["folder"].asString());
gDirUtilp->append(strPath, "themes");
gDirUtilp->append(strPath, sdTheme["folder"].asString());
if (gDirUtilp->fileExists(strPath))
if ( (gDirUtilp->fileExists(strPath)) || (sdTheme["folder"].asString().empty()) )
{
m_pSkinThemeCombo->add(sdTheme["name"].asString(), sdTheme["folder"]);
}