From 2bc12a150a2fbb74e13f9ac2a67707b4f5782932 Mon Sep 17 00:00:00 2001 From: Rye Mutt <rye@alchemyviewer.org> Date: Sun, 17 Apr 2022 16:45:34 -0400 Subject: [PATCH] Fix building with asserts --- indra/llinventory/llsettingsbase.cpp | 2 +- indra/newview/llappviewer.cpp | 3 ++- indra/newview/llpanelface.cpp | 1 - 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/indra/llinventory/llsettingsbase.cpp b/indra/llinventory/llsettingsbase.cpp index 949c34de084..746dc420e89 100644 --- a/indra/llinventory/llsettingsbase.cpp +++ b/indra/llinventory/llsettingsbase.cpp @@ -169,7 +169,7 @@ LLSD LLSettingsBase::interpolateSDMap(const LLSD &settings, const LLSD &other, c const stringset_t& skip = getSkipInterpolateKeys(); const stringset_t& slerps = getSlerpKeys(); - llassert(mix >= 0.0f && mix <= 1.0f); + //llassert(mix >= 0.0f && mix <= 1.0f); for (const auto& llsd_pair : settings.map()) { diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp index 71680f1ab67..26e0082a1c4 100644 --- a/indra/newview/llappviewer.cpp +++ b/indra/newview/llappviewer.cpp @@ -2196,6 +2196,8 @@ void errorCallback(LLError::ELevel level, const std::string &error_string) if (level == LLError::LEVEL_ERROR) { #ifdef SHOW_ASSERT + static std::string last_message; + if (error_string == last_message) return; OSMessageBox(error_string, LLTrans::getString("MBFatalError"), OSMB_OK); U32 response = OSMessageBox(error_string, LLTrans::getString("MBFatalError"), OSMB_YESNO); if (response == OSBTN_NO) @@ -4416,7 +4418,6 @@ void LLAppViewer::purgeCache() LL_INFOS("AppCache") << "Purging Cache and Texture Cache..." << LL_ENDL; LLAppViewer::getTextureCache()->purgeCache(LL_PATH_CACHE); LLVOCache::getInstance()->removeCache(LL_PATH_CACHE); - LLVOCache::getInstance()->removeCache(LL_PATH_CACHE_PER_GRID); std::string browser_cache = gDirUtilp->getExpandedFilename(LL_PATH_CACHE, "cef_cache"); if (LLFile::isdir(browser_cache)) { diff --git a/indra/newview/llpanelface.cpp b/indra/newview/llpanelface.cpp index ea7750266c2..4b173196cb3 100644 --- a/indra/newview/llpanelface.cpp +++ b/indra/newview/llpanelface.cpp @@ -429,7 +429,6 @@ struct LLPanelFaceSetTEFunctor : public LLSelectedTEFunctor LLCheckBoxCtrl* cb_planar_align = mPanel->getChild<LLCheckBoxCtrl>("checkbox planar align"); bool align_planar = (cb_planar_align && cb_planar_align->get()); - llassert(comboTexGen); llassert(object); if (ctrlTexScaleS) -- GitLab