diff options
| -rw-r--r-- | indra/newview/llfloaterpreference.cpp | 23 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/en/control_table_contents.xml | 4 |
2 files changed, 18 insertions, 9 deletions
diff --git a/indra/newview/llfloaterpreference.cpp b/indra/newview/llfloaterpreference.cpp index 50b7f16ec7..0896493f07 100644 --- a/indra/newview/llfloaterpreference.cpp +++ b/indra/newview/llfloaterpreference.cpp @@ -2669,21 +2669,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; diff --git a/indra/newview/skins/default/xui/en/control_table_contents.xml b/indra/newview/skins/default/xui/en/control_table_contents.xml index 288075628c..da9cceb2db 100644 --- a/indra/newview/skins/default/xui/en/control_table_contents.xml +++ b/indra/newview/skins/default/xui/en/control_table_contents.xml @@ -18,6 +18,7 @@ name="lst_ctrl3" /> <rows enabled="false" + name="move_actions" value=""> <columns type="icontext" @@ -202,6 +203,7 @@ </rows> <rows enabled="false" + name="camera_actions" value=""> <columns type="icontext" @@ -424,6 +426,7 @@ </rows> <rows enabled="false" + name="editing_actions" value=""> <columns type="icontext" @@ -502,6 +505,7 @@ </rows> <rows enabled="false" + name="media_actions" value=""> <columns type="icontext" |