Second Life viewer sources 1.20.13

3 files changed, 40 insertions, 23 deletions

diff --git a/linden/indra/llui/llui.cpp b/linden/indra/llui/llui.cpp
index d2084e3..11889be 100644
--- a/linden/indra/llui/llui.cpp
+++ b/linden/indra/llui/llui.cpp
@@ -1671,13 +1671,13 @@ LLString LLUI::locateSkin(const LLString& filename)
                                 localization = sConfigGroup->getString("SystemLanguage");
                         }
                         LLString local_skin = "xui" + slash + localization + slash + filename;
-                        found_file = gDirUtilp->getExpandedFilename(LL_PATH_SKINS, local_skin);
+                        found_file = gDirUtilp->findSkinnedFilename(local_skin);
                 }
         }
         if (!gDirUtilp->fileExists(found_file))
         {
                 LLString local_skin = "xui" + slash + "en-us" + slash + filename;
-                found_file = gDirUtilp->getExpandedFilename(LL_PATH_SKINS, local_skin);
+                found_file = gDirUtilp->findSkinnedFilename(local_skin);
         }
         if (!gDirUtilp->fileExists(found_file))
         {
diff --git a/linden/indra/llui/lluictrlfactory.cpp b/linden/indra/llui/lluictrlfactory.cpp
index 7df6ebe..212c1c5 100644
--- a/linden/indra/llui/lluictrlfactory.cpp
+++ b/linden/indra/llui/lluictrlfactory.cpp
@@ -76,7 +76,7 @@ const S32 VPAD = 4;
 const S32 FLOATER_H_MARGIN = 15;
 const S32 MIN_WIDGET_HEIGHT = 10;
 
-std::vector<LLString> LLUICtrlFactory::mXUIPaths;
+std::vector<LLString> LLUICtrlFactory::sXUIPaths;
 
 // UI Ctrl class for padding
 class LLUICtrlLocate : public LLUICtrl
@@ -121,12 +121,11 @@ void LLUICtrlFactory::setupPaths()
 
         LLXMLNodePtr root;
         BOOL success  = LLXMLNode::parseFile(filename, root, NULL);
-        mXUIPaths.clear();
+        sXUIPaths.clear();
         
         if (success)
         {
                 LLXMLNodePtr path;
-                LLString app_dir = gDirUtilp->getAppRODataDir();
         
                 for (path = root->getFirstChild(); path.notNull(); path = path->getNextSibling())
                 {
@@ -140,21 +139,20 @@ void LLUICtrlFactory::setupPaths()
                                         language = LLUI::sConfigGroup->getString("SystemLanguage");
                                 }
                         }
-                        path_val_ui.setArg("[Language]", language);
-                        LLString fullpath = app_dir + path_val_ui.getString();
+                        path_val_ui.setArg("[LANGUAGE]", language);
 
-                        if (std::find(mXUIPaths.begin(), mXUIPaths.end(), fullpath) == mXUIPaths.end())
+                        if (std::find(sXUIPaths.begin(), sXUIPaths.end(), path_val_ui.getString()) == sXUIPaths.end())
                         {
-                                mXUIPaths.push_back(app_dir + path_val_ui.getString());
+                                sXUIPaths.push_back(path_val_ui.getString());
                         }
                 }
         }
         else // parsing failed
         {
                 LLString slash = gDirUtilp->getDirDelimiter();
-                LLString dir = gDirUtilp->getAppRODataDir() + slash + "skins" + slash + "xui" + slash + "en-us" + slash;
-                llwarns << "XUI::config file unable to open." << llendl;
-                mXUIPaths.push_back(dir);
+                LLString dir = "xui" + slash + "en-us";
+                llwarns << "XUI::config file unable to open: " << filename << llendl;
+                sXUIPaths.push_back(dir);
         }
 }
 
@@ -163,14 +161,22 @@ void LLUICtrlFactory::setupPaths()
 //-----------------------------------------------------------------------------
 // getLayeredXMLNode()
 //-----------------------------------------------------------------------------
-bool LLUICtrlFactory::getLayeredXMLNode(const LLString &filename, LLXMLNodePtr& root)
+bool LLUICtrlFactory::getLayeredXMLNode(const LLString &xui_filename, LLXMLNodePtr& root)
 {
-        if (!LLXMLNode::parseFile(mXUIPaths.front() + filename, root, NULL))
-        {       
-                if (!LLXMLNode::parseFile(filename, root, NULL))
+        std::string full_filename = gDirUtilp->findSkinnedFilename(sXUIPaths.front(), xui_filename);
+        if (full_filename.empty())
+        {
+                llwarns << "Couldn't find UI description file: " << sXUIPaths.front() + gDirUtilp->getDirDelimiter() + xui_filename << llendl;
+                return false;
+        }
+
+        if (!LLXMLNode::parseFile(full_filename, root, NULL))
+        {
+                // try filename as passed in since sometimes we load an xml file from a user-supplied path
+                if (!LLXMLNode::parseFile(xui_filename, root, NULL))
                 {
-                        llwarns << "Problem reading UI description file: " << mXUIPaths.front() + filename << llendl;
-                        return FALSE;
+                        llwarns << "Problem reading UI description file: " << xui_filename << llendl;
+                        return false;
                 }
         }
 
@@ -178,13 +184,24 @@ bool LLUICtrlFactory::getLayeredXMLNode(const LLString &filename, LLXMLNodePtr&
 
         std::vector<LLString>::const_iterator itor;
 
-        for (itor = mXUIPaths.begin(), ++itor; itor != mXUIPaths.end(); ++itor)
+        for (itor = sXUIPaths.begin(), ++itor; itor != sXUIPaths.end(); ++itor)
         {
                 LLString nodeName;
                 LLString updateName;
 
-                LLXMLNode::parseFile((*itor) + filename, updateRoot, NULL);
-        
+                std::string layer_filename = gDirUtilp->findSkinnedFilename((*itor), xui_filename);
+                if(layer_filename.empty())
+                {
+                        // no localized version of this file, that's ok, keep looking
+                        continue;
+                }
+
+                if (!LLXMLNode::parseFile(layer_filename, updateRoot, NULL))
+                {
+                        llwarns << "Problem reading localized UI description file: " << (*itor) + gDirUtilp->getDirDelimiter() + xui_filename << llendl;
+                        return false;
+                }
+
                 updateRoot->getAttributeString("name", updateName);
                 root->getAttributeString("name", nodeName);
 
@@ -194,7 +211,7 @@ bool LLUICtrlFactory::getLayeredXMLNode(const LLString &filename, LLXMLNodePtr&
                 }
         }
 
-        return TRUE;
+        return true;
 }
 
 
diff --git a/linden/indra/llui/lluictrlfactory.h b/linden/indra/llui/lluictrlfactory.h
index 0c1d9dd..16170ac 100644
--- a/linden/indra/llui/lluictrlfactory.h
+++ b/linden/indra/llui/lluictrlfactory.h
@@ -87,7 +87,7 @@ private:
 
         std::deque<const LLCallbackMap::map_t*> mFactoryStack;
 
-        static std::vector<LLString> mXUIPaths;
+        static std::vector<LLString> sXUIPaths;
 
         LLPanel* mDummyPanel;
 };