1 files changed, 14 insertions, 9 deletions
diff --git a/indra/newview/llfloaterpreference.cpp b/indra/newview/llfloaterpreference.cpp
index 98f4881eb6..05de782838 100644
--- a/indra/newview/llfloaterpreference.cpp
+++ b/indra/newview/llfloaterpreference.cpp
@@ -2720,21 +2720,26 @@ void LLPanelPreferenceControls::populateControlTable()
         return;
     }
 
-    std::string full_filename = gDirUtilp->findSkinnedFilenameBaseLang(LLDir::XUI, filename);
-    LLSimpleXUIParser parser;
+    LLXMLNodePtr xmlNode;
     LLScrollListCtrl::Contents contents;
-    if (!parser.readXUI(full_filename, contents)
-        || !contents.validateBlock())
+    if (!LLUICtrlFactory::getLayeredXMLNode(filename, xmlNode))
+    {
+    LL_WARNS() << "Failed to load " << filename << LL_ENDL;
+    return;
+    }
+    LLXUIParser parser;
+    parser.readXUI(xmlNode, contents, filename);
+
+    if (!contents.validateBlock())
     {
-        LL_INFOS() << "Failed to load" << LL_ENDL;
         return;
     }
 
-    for (LLInitParam::ParamIterator<LLScrollListColumn::Params>::const_iterator row_it = contents.columns.begin();
-        row_it != contents.columns.end();
-        ++row_it)
+    for (LLInitParam::ParamIterator<LLScrollListColumn::Params>::const_iterator col_it = contents.columns.begin();
+        col_it != contents.columns.end();
+        ++col_it)
     {
-        pControlsTable->addColumn(*row_it);
+        pControlsTable->addColumn(*col_it);
     }
 
     LLScrollListCell::Params cell_params;