diff --git a/indra/newview/llviewertexlayer.cpp b/indra/newview/llviewertexlayer.cpp
index 66e5742911e85d03128fa23328f2b638d5dc94c0..7f7d190b92f7f773d39c48055dbd833eb174619a 100644
--- a/indra/newview/llviewertexlayer.cpp
+++ b/indra/newview/llviewertexlayer.cpp
@@ -58,6 +58,8 @@ LLViewerTexLayerSetBuffer::LLViewerTexLayerSetBuffer(LLTexLayerSet* const owner,
 	mNeedsUpdate(TRUE),
 	mNumLowresUpdates(0)
 {
+	mGLTexturep->setNeedsAlphaAndPickMask(FALSE);
+
 	LLViewerTexLayerSetBuffer::sGLByteCount += getSize();
 	mNeedsUpdateTimer.start();
 }
diff --git a/indra/newview/llwlparamset.cpp b/indra/newview/llwlparamset.cpp
index 066cb9a0ace352fa61aca7f4204323633b77d652..85e95f93257bd87ee407508813d72da6cd7185de 100644
--- a/indra/newview/llwlparamset.cpp
+++ b/indra/newview/llwlparamset.cpp
@@ -337,14 +337,14 @@ void LLWLParamSet::mix(LLWLParamSet& src, LLWLParamSet& dest, F32 weight)
 	setStarBrightness((1 - weight) * (F32) src.getStarBrightness()
 		+ weight * (F32) dest.getStarBrightness());
 
-	llassert(src.getSunAngle() >= - F_PI && 
-					src.getSunAngle() <= 3 * F_PI);
-	llassert(dest.getSunAngle() >= - F_PI && 
-					dest.getSunAngle() <= 3 * F_PI);
-	llassert(src.getEastAngle() >= 0 && 
-					src.getEastAngle() <= 4 * F_PI);
-	llassert(dest.getEastAngle() >= 0 && 
-					dest.getEastAngle() <= 4 * F_PI);
+	//llassert(src.getSunAngle() >= - F_PI && 
+	//				src.getSunAngle() <= 3 * F_PI);
+	//llassert(dest.getSunAngle() >= - F_PI && 
+	//				dest.getSunAngle() <= 3 * F_PI);
+	//llassert(src.getEastAngle() >= 0 && 
+	//				src.getEastAngle() <= 4 * F_PI);
+	//llassert(dest.getEastAngle() >= 0 && 
+	//				dest.getEastAngle() <= 4 * F_PI);
 
 	// sun angle and east angle require some handling to make sure
 	// they go in circles.  Yes quaternions would work better.