From b24635d24e71f78af1e0bfa2a910241711604bca Mon Sep 17 00:00:00 2001
From: Shyotl <Shyotl@gmail.com>
Date: Sat, 1 Apr 2017 21:55:13 -0500
Subject: [PATCH] RMSE bugfixes.

---
 indra/llrender/llimagegl.cpp               | 2 +-
 indra/newview/app_settings/settings_sh.xml | 2 +-
 indra/newview/llviewerwindow.cpp           | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/indra/llrender/llimagegl.cpp b/indra/llrender/llimagegl.cpp
index 9d5c14e47..8164764bf 100644
--- a/indra/llrender/llimagegl.cpp
+++ b/indra/llrender/llimagegl.cpp
@@ -2203,7 +2203,7 @@ void LLImageGL::analyzeAlpha(const void* data_in, U32 w, U32 h)
 		mIsMask = TRUE;
 	}
 
-	mMaskMidPercentile = (F32)mids / (F32)length;
+	mMaskMidPercentile = (F32)mids / (F32)(w * h);
 	mMaskRMSE = ((max-min)%255)==0 ? sqrt(sum)/255.0 : FLT_MAX;
 	
 	/*std::list<std::pair<std::string,std::string> > &data = sTextureMaskMap[getTexName()];
diff --git a/indra/newview/app_settings/settings_sh.xml b/indra/newview/app_settings/settings_sh.xml
index 73e7d1cc3..e2c8a5fb7 100644
--- a/indra/newview/app_settings/settings_sh.xml
+++ b/indra/newview/app_settings/settings_sh.xml
@@ -216,7 +216,7 @@
       <key>Type</key>
       <string>F32</string>
       <key>Value</key>
-      <real>0.2</real>
+      <real>0.18</real>
     </map>
     <key>SHAutoMaskMaxMid</key>
     <map>
diff --git a/indra/newview/llviewerwindow.cpp b/indra/newview/llviewerwindow.cpp
index 54f249770..83cee3ec1 100644
--- a/indra/newview/llviewerwindow.cpp
+++ b/indra/newview/llviewerwindow.cpp
@@ -351,7 +351,7 @@ public:
 				if(obj)
 				{
 					S32 te = nodep ? nodep->getLastSelectedTE() : -1;
-					if(te > 0)
+					if(te >= 0)
 					{
 						LLViewerTexture* imagep = obj->getTEImage(te);
 						if(imagep && imagep != (LLViewerTexture*)LLViewerFetchedTexture::sDefaultImagep.get())