Merge of windlight into release (QAR-286). This includes all changes in

windlight14 which have passed QA (up through r79932).

svn merge -r 80831:80833 svn+ssh://svn.lindenlab.com/svn/linden/branches/merge_windlight14_r80620

1 files changed, 12 insertions, 13 deletions

diff --git a/indra/newview/lltextureview.cpp b/indra/newview/lltextureview.cpp
index 031492e0e9..b5d4818fba 100644
--- a/indra/newview/lltextureview.cpp
+++ b/indra/newview/lltextureview.cpp
@@ -40,6 +40,7 @@
 #include "lllfsthread.h"
 #include "llui.h"
 #include "llimageworker.h"
+#include "llglimmediate.h"
 
 #include "llhoverview.h"
 #include "llselectmgr.h"
@@ -257,7 +258,7 @@ void LLTextureBar::draw()
 	left = bar_left;
 	right = left + bar_width;
 
-	glColor4f(0.f, 0.f, 0.f, 0.75f);
+	gGL.color4f(0.f, 0.f, 0.f, 0.75f);
 	gl_rect_2d(left, top, right, bottom);
 
 	F32 data_progress = mImagep->mDownloadProgress;
@@ -268,7 +269,7 @@ void LLTextureBar::draw()
 		right = left + llfloor(data_progress * (F32)bar_width);
 		if (right > left)
 		{
-			glColor4f(0.f, 0.f, 1.f, 0.75f);
+			gGL.color4f(0.f, 0.f, 1.f, 0.75f);
 			gl_rect_2d(left, top, right, bottom);
 		}
 	}
@@ -302,7 +303,7 @@ void LLTextureBar::draw()
 	if (last_event < 1.f)
 	{
 		clr.setAlpha(1.f - last_event);
-		glColor4fv(clr.mV);
+		gGL.color4fv(clr.mV);
 		gl_rect_2d(pip_x, top, pip_x + pip_width, bottom);
 	}
 	pip_x += pip_width + pip_space;
@@ -316,7 +317,7 @@ void LLTextureBar::draw()
 		{
 			clr = mImagep->getMissed() ? LLColor4::red : LLColor4::magenta1;
 			clr.setAlpha(1.f - last_event);
-			glColor4fv(clr.mV);
+			gGL.color4fv(clr.mV);
 			gl_rect_2d(pip_x, top, pip_x + pip_width, bottom);
 		}
 	}
@@ -422,7 +423,7 @@ void LLGLTexMemBar::draw()
 	
 	LLGLSNoTexture gls_no_texture;
 	
-	glColor4f(0.5f, 0.5f, 0.5f, 0.75f);
+	gGL.color4f(0.5f, 0.5f, 0.5f, 0.75f);
 	gl_rect_2d(left, top, right, bottom);
 
 	
@@ -430,15 +431,15 @@ void LLGLTexMemBar::draw()
 	right = left + llfloor(bound_mem * bar_scale);
 	if (bound_mem < llfloor(max_bound_mem * texmem_lower_bound_scale))
 	{
-		glColor4f(0.f, 1.f, 0.f, 0.75f);
+		gGL.color4f(0.f, 1.f, 0.f, 0.75f);
 	}
 	else if (bound_mem < max_bound_mem)
 	{
-		glColor4f(1.f, 1.f, 0.f, 0.75f);
+		gGL.color4f(1.f, 1.f, 0.f, 0.75f);
 	}
 	else
 	{
-		glColor4f(1.f, 0.f, 0.f, 0.75f);
+		gGL.color4f(1.f, 0.f, 0.f, 0.75f);
 	}
 	gl_rect_2d(left, top, right, bottom);
 
@@ -450,22 +451,20 @@ void LLGLTexMemBar::draw()
 	right = left + llfloor(total_mem * bar_scale);
 	if (total_mem < llfloor(max_total_mem * texmem_lower_bound_scale))
 	{
-		glColor4f(0.f, 1.f, 0.f, 0.75f);
+		gGL.color4f(0.f, 1.f, 0.f, 0.75f);
 	}
 	else if (total_mem < max_total_mem)
 	{
-		glColor4f(1.f, 1.f, 0.f, 0.75f);
+		gGL.color4f(1.f, 1.f, 0.f, 0.75f);
 	}
 	else
 	{
-		glColor4f(1.f, 0.f, 0.f, 0.75f);
+		gGL.color4f(1.f, 0.f, 0.f, 0.75f);
 	}
 	gl_rect_2d(left, top, right, bottom);
 
 	//----------------------------------------------------------------------------
 
-	LLGLEnable tex(GL_TEXTURE_2D);
-	
 	text = llformat("Textures: Count: %d Fetch: %d(%d) Pkts:%d(%d) Cache R/W: %d/%d LFS:%d IW:%d(%d) RAW:%d",
 					gImageList.getNumImages(),
 					LLAppViewer::getTextureFetch()->getNumRequests(), LLAppViewer::getTextureFetch()->getNumDeletes(),