diff options
| author | Brad Linden <brad@lindenlab.com> | 2024-05-20 11:14:29 -0700 |
|---|---|---|
| committer | Brad Linden <brad@lindenlab.com> | 2024-05-20 11:14:29 -0700 |
| commit | 6af5db09faf5ea33a2d4c47b64e76f42edae178a (patch) | |
| tree | d746c96bab1bfd44c6373926608e91c0f2fd9e49 /indra/llui/llfloater.cpp | |
| parent | eab232d3ed49bfb1f873e332ff57ec8c311c163b (diff) | |
| parent | 6d6eabca44d08d5b97bfe3e941d2b9687c2246ea (diff) | |
Merge remote-tracking branch 'origin/DRTVWR-600-maint-A' into brad/merge-maint-a-to-dev
Diffstat (limited to 'indra/llui/llfloater.cpp')
| -rw-r--r-- | indra/llui/llfloater.cpp | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/indra/llui/llfloater.cpp b/indra/llui/llfloater.cpp index 25006abf2c..48693c6267 100644 --- a/indra/llui/llfloater.cpp +++ b/indra/llui/llfloater.cpp @@ -3522,16 +3522,12 @@ bool LLFloater::isVisible(const LLFloater* floater) return floater && floater->getVisible(); } -bool LLFloater::buildFromFile(const std::string& filename, bool cacheable) +bool LLFloater::buildFromFile(const std::string& filename) { LL_PROFILE_ZONE_SCOPED; - - llassert_msg(!cacheable || !mSingleInstance || !mReuseInstance, - "No needs to cache XML for floater with mSingleInstance AND mReuseInstance flags set"); - LLXMLNodePtr root; - if (!LLUICtrlFactory::getLayeredXMLNode(filename, root, LLDir::CURRENT_SKIN, cacheable)) + if (!LLUICtrlFactory::getLayeredXMLNode(filename, root)) { LL_WARNS() << "Couldn't find (or parse) floater from: " << filename << LL_ENDL; return false; |