SL-10486, SL-10501, SL-10487

Make moon texture from default daycycle the default moon texture id and use it for the default and blank assets in the picker.

Fix handling of MM_TEXTURE to correctly detect when texture units outside the range 0-3
are used with texture matrix ops to prevent mem overwrite bug and/or asserts.

2 files changed, 8 insertions, 10 deletions

diff --git a/indra/newview/lldrawpoolavatar.cpp b/indra/newview/lldrawpoolavatar.cpp
index eaf5b7dd68..9fa76c0d97 100644
--- a/indra/newview/lldrawpoolavatar.cpp
+++ b/indra/newview/lldrawpoolavatar.cpp
@@ -1999,13 +1999,14 @@ void LLDrawPoolAvatar::renderRigged(LLVOAvatar* avatar, U32 type, bool glow)
 
 			if (face->mTextureMatrix && vobj->mTexAnimMode)
 			{
+                // we don't support tex matrix ops on anything but texture_matrix0 and texture_matrix1
+                // if you hit this assert, you most likely need to fix your content
+                llassert(gGL.getCurrentTexUnitIndex() <= 1);
+
 				gGL.matrixMode(LLRender::MM_TEXTURE);
 				gGL.loadMatrix((F32*) face->mTextureMatrix->mMatrix);
-
 				buff->setBuffer(data_mask);
 				buff->drawRange(LLRender::TRIANGLES, start, end, count, offset);
-
-                gGL.matrixMode(LLRender::MM_TEXTURE);
 				gGL.loadIdentity();
 				
 			}
diff --git a/indra/newview/llweb.cpp b/indra/newview/llweb.cpp
index 768db047a4..2760ebd1df 100644
--- a/indra/newview/llweb.cpp
+++ b/indra/newview/llweb.cpp
@@ -268,12 +268,9 @@ bool LLWeb::useExternalBrowser(const std::string &url)
 		boost::match_results<std::string::const_iterator> matches;
 		return !(boost::regex_search(uri_string, matches, pattern));
 	}
-	else
-	{
-		boost::regex pattern = boost::regex("^mailto:", boost::regex::perl | boost::regex::icase);
-		boost::match_results<std::string::const_iterator> matches;
-		return boost::regex_search(url, matches, pattern);
-	}
-	return false;
+
+	boost::regex pattern = boost::regex("^mailto:", boost::regex::perl | boost::regex::icase);
+	boost::match_results<std::string::const_iterator> matches;
+	return boost::regex_search(url, matches, pattern);
 #endif
 }