diff options
author | Andrey Kleshchev <andreykproductengine@lindenlab.com> | 2024-05-13 18:26:53 +0300 |
---|---|---|
committer | Andrey Kleshchev <117672381+akleshchev@users.noreply.github.com> | 2024-05-13 21:25:58 +0300 |
commit | 2008f87f10d51a2f9372aa4a4d72e86ac94e1e81 (patch) | |
tree | 2f9f228e3e08380ddad59539669f31667d3dd4a7 /indra/llui/lluictrlfactory.cpp | |
parent | ad6425173900855852b8c8437cc88120ea46cc53 (diff) |
Revert "viewer#819 Avoid reading the same XML file multiple times"
This reverts commit a865d423974ea06dffa47798c81e98e7570b02ec.
Reason for revert: viewer#1420, reverting to not hold maint-A (is deepCopy not full?)
Diffstat (limited to 'indra/llui/lluictrlfactory.cpp')
-rw-r--r-- | indra/llui/lluictrlfactory.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/llui/lluictrlfactory.cpp b/indra/llui/lluictrlfactory.cpp index 706140fd49..dca777cc1f 100644 --- a/indra/llui/lluictrlfactory.cpp +++ b/indra/llui/lluictrlfactory.cpp @@ -157,7 +157,7 @@ void LLUICtrlFactory::createChildren(LLView* viewp, LLXMLNodePtr node, const wid // getLayeredXMLNode() //----------------------------------------------------------------------------- bool LLUICtrlFactory::getLayeredXMLNode(const std::string &xui_filename, LLXMLNodePtr& root, - LLDir::ESkinConstraint constraint, bool cacheable) + LLDir::ESkinConstraint constraint) { LL_PROFILE_ZONE_SCOPED_CATEGORY_UI; std::vector<std::string> paths = @@ -169,7 +169,7 @@ bool LLUICtrlFactory::getLayeredXMLNode(const std::string &xui_filename, LLXMLNo paths.push_back(xui_filename); } - return LLXMLNode::getLayeredXMLNode(root, paths, cacheable); + return LLXMLNode::getLayeredXMLNode(root, paths); } |