From 86ed867f4d9290aac63937268a96031aa8b85c9f Mon Sep 17 00:00:00 2001 From: Kitty Barnett Date: Thu, 3 Jan 2013 22:15:08 +0100 Subject: [PATCH] Sync'ed Viewer-Skins patch with latest for SL-3.4 (missing commit) --- indra/llvfs/lldir.cpp | 1 + indra/newview/llfloaterpreference.cpp | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/indra/llvfs/lldir.cpp b/indra/llvfs/lldir.cpp index a631033fa9..3517ebc60a 100644 --- a/indra/llvfs/lldir.cpp +++ b/indra/llvfs/lldir.cpp @@ -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); diff --git a/indra/newview/llfloaterpreference.cpp b/indra/newview/llfloaterpreference.cpp index 9e22064bc1..d220240473 100644 --- a/indra/newview/llfloaterpreference.cpp +++ b/indra/newview/llfloaterpreference.cpp @@ -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"]); }