diff --git a/indra/llinventory/llsettingsbase.cpp b/indra/llinventory/llsettingsbase.cpp
index 949c34de08465db16adf93e19847845bf4459e27..746dc420e8902cb1d9b14af21e14c336d61078a8 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 71680f1ab67a399dbe2423160146949855b546fc..26e0082a1c473bc71add4cbce72d712890f76d48 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 ea7750266c238e0ada832325f2c86ad2a669c202..4b173196cb37eaa494812edcad8add8ead624308 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)