Pull merge from lindenlab/viewer-release. Fixed some conflicts and compile errors

1 files changed, 259 insertions, 211 deletions

diff --git a/indra/llrender/llrender2dutils.cpp b/indra/llrender/llrender2dutils.cpp
index d3cfbaf03a..df5d79a436 100644
--- a/indra/llrender/llrender2dutils.cpp
+++ b/indra/llrender/llrender2dutils.cpp
@@ -35,6 +35,7 @@
 #include "llrect.h"
 #include "llgl.h"
 #include "lltexture.h"
+#include "llfasttimer.h"
 
 // Project includes
 #include "llrender2dutils.h"
@@ -347,27 +348,32 @@ void gl_draw_image( S32 x, S32 y, LLTexture* image, const LLColor4& color, const
 {
 	if (NULL == image)
 	{
-		llwarns << "image == NULL; aborting function" << llendl;
+		LL_WARNS() << "image == NULL; aborting function" << LL_ENDL;
 		return;
 	}
 	gl_draw_scaled_rotated_image( x, y, image->getWidth(0), image->getHeight(0), 0.f, image, color, uv_rect );
 }
 
+void gl_draw_scaled_target(S32 x, S32 y, S32 width, S32 height, LLRenderTarget* target, const LLColor4& color, const LLRectf& uv_rect)
+{
+	gl_draw_scaled_rotated_image(x, y, width, height, 0.f, NULL, color, uv_rect, target);
+}
+
 void gl_draw_scaled_image(S32 x, S32 y, S32 width, S32 height, LLTexture* image, const LLColor4& color, const LLRectf& uv_rect)
 {
 	if (NULL == image)
 	{
-		llwarns << "image == NULL; aborting function" << llendl;
+		LL_WARNS() << "image == NULL; aborting function" << LL_ENDL;
 		return;
 	}
 	gl_draw_scaled_rotated_image( x, y, width, height, 0.f, image, color, uv_rect );
 }
 
-void gl_draw_scaled_image_with_border(S32 x, S32 y, S32 border_width, S32 border_height, S32 width, S32 height, LLTexture* image, const LLColor4& color, BOOL solid_color, const LLRectf& uv_rect)
+void gl_draw_scaled_image_with_border(S32 x, S32 y, S32 border_width, S32 border_height, S32 width, S32 height, LLTexture* image, const LLColor4& color, BOOL solid_color, const LLRectf& uv_rect, bool scale_inner)
 {
 	if (NULL == image)
 	{
-		llwarns << "image == NULL; aborting function" << llendl;
+		LL_WARNS() << "image == NULL; aborting function" << LL_ENDL;
 		return;
 	}
 
@@ -376,250 +382,273 @@ void gl_draw_scaled_image_with_border(S32 x, S32 y, S32 border_width, S32 border
 	F32 border_height_fraction = (F32)border_height / (F32)image->getHeight(0);
 
 	LLRectf scale_rect(border_width_fraction, 1.f - border_height_fraction, 1.f - border_width_fraction, border_height_fraction);
-	gl_draw_scaled_image_with_border(x, y, width, height, image, color, solid_color, uv_rect, scale_rect);
+	gl_draw_scaled_image_with_border(x, y, width, height, image, color, solid_color, uv_rect, scale_rect, scale_inner);
 }
 
-void gl_draw_scaled_image_with_border(S32 x, S32 y, S32 width, S32 height, LLTexture* image, const LLColor4& color, BOOL solid_color, const LLRectf& uv_outer_rect, const LLRectf& center_rect)
+void gl_draw_scaled_image_with_border(S32 x, S32 y, S32 width, S32 height, LLTexture* image, const LLColor4& color, BOOL solid_color, const LLRectf& uv_outer_rect, const LLRectf& center_rect, bool scale_inner)
 {
 	stop_glerror();
 
 	if (NULL == image)
 	{
-		llwarns << "image == NULL; aborting function" << llendl;
+		LL_WARNS() << "image == NULL; aborting function" << LL_ENDL;
 		return;
 	}
 
-	// add in offset of current image to current UI translation
-	const LLVector3 ui_scale = gGL.getUIScale();
-	const LLVector3 ui_translation = (gGL.getUITranslation() + LLVector3(x, y, 0.f)).scaledVec(ui_scale);
-
-	F32 uv_width = uv_outer_rect.getWidth();
-	F32 uv_height = uv_outer_rect.getHeight();
-
-	// shrink scaling region to be proportional to clipped image region
-	LLRectf uv_center_rect(
-		uv_outer_rect.mLeft + (center_rect.mLeft * uv_width),
-		uv_outer_rect.mBottom + (center_rect.mTop * uv_height),
-		uv_outer_rect.mLeft + (center_rect.mRight * uv_width),
-		uv_outer_rect.mBottom + (center_rect.mBottom * uv_height));
-
-	F32 image_width = image->getWidth(0);
-	F32 image_height = image->getHeight(0);
+	if (solid_color)
+	{
+		if (LLGLSLShader::sNoFixedFunction)
+		{
+			gSolidColorProgram.bind();
+		}
+		else
+		{
+			gGL.getTexUnit(0)->setTextureColorBlend(LLTexUnit::TBO_REPLACE, LLTexUnit::TBS_PREV_COLOR);
+			gGL.getTexUnit(0)->setTextureAlphaBlend(LLTexUnit::TBO_MULT, LLTexUnit::TBS_TEX_ALPHA, LLTexUnit::TBS_VERT_ALPHA);
+		}
+	}
 
-	S32 image_natural_width = llround(image_width * uv_width);
-	S32 image_natural_height = llround(image_height * uv_height);
+	if (center_rect.mLeft == 0.f
+		&& center_rect.mRight == 1.f
+		&& center_rect.mBottom == 0.f
+		&& center_rect.mTop == 1.f)
+	{
+		gl_draw_scaled_image(x, y, width, height, image, color, uv_outer_rect);
+	}
+	else
+	{
+		// add in offset of current image to current UI translation
+		const LLVector3 ui_scale = gGL.getUIScale();
+		const LLVector3 ui_translation = (gGL.getUITranslation() + LLVector3(x, y, 0.f)).scaledVec(ui_scale);
 
-	LLRectf draw_center_rect(	uv_center_rect.mLeft * image_width,
-								uv_center_rect.mTop * image_height,
-								uv_center_rect.mRight * image_width,
-								uv_center_rect.mBottom * image_height);
+		F32 uv_width = uv_outer_rect.getWidth();
+		F32 uv_height = uv_outer_rect.getHeight();
 
-	{	// scale fixed region of image to drawn region
-		draw_center_rect.mRight += width - image_natural_width;
-		draw_center_rect.mTop += height - image_natural_height;
+		// shrink scaling region to be proportional to clipped image region
+		LLRectf uv_center_rect(	uv_outer_rect.mLeft + (center_rect.mLeft * uv_width),
+								uv_outer_rect.mBottom + (center_rect.mTop * uv_height),
+								uv_outer_rect.mLeft + (center_rect.mRight * uv_width),
+								uv_outer_rect.mBottom + (center_rect.mBottom * uv_height));
 
-		F32 border_shrink_width = llmax(0.f, draw_center_rect.mLeft - draw_center_rect.mRight);
-		F32 border_shrink_height = llmax(0.f, draw_center_rect.mBottom - draw_center_rect.mTop);
+		F32 image_width = image->getWidth(0);
+		F32 image_height = image->getHeight(0);
 
-		F32 shrink_width_ratio = center_rect.getWidth() == 1.f ? 0.f : border_shrink_width / ((F32)image_natural_width * (1.f - center_rect.getWidth()));
-		F32 shrink_height_ratio = center_rect.getHeight() == 1.f ? 0.f : border_shrink_height / ((F32)image_natural_height * (1.f - center_rect.getHeight()));
+		S32 image_natural_width = llround(image_width * uv_width);
+		S32 image_natural_height = llround(image_height * uv_height);
 
-		F32 shrink_scale = 1.f - llmax(shrink_width_ratio, shrink_height_ratio);
+		LLRectf draw_center_rect(	uv_center_rect.mLeft * image_width,
+									uv_center_rect.mTop * image_height,
+									uv_center_rect.mRight * image_width,
+									uv_center_rect.mBottom * image_height);
+		
+		if (scale_inner)
+		{
+			// scale center region of image to drawn region
+			draw_center_rect.mRight += width - image_natural_width;
+			draw_center_rect.mTop += height - image_natural_height;
 
-		draw_center_rect.mLeft = llround(ui_translation.mV[VX] + (F32)draw_center_rect.mLeft * shrink_scale * ui_scale.mV[VX]);
-		draw_center_rect.mTop = llround(ui_translation.mV[VY] + lerp((F32)height, (F32)draw_center_rect.mTop, shrink_scale) * ui_scale.mV[VY]);
-		draw_center_rect.mRight = llround(ui_translation.mV[VX] + lerp((F32)width, (F32)draw_center_rect.mRight, shrink_scale) * ui_scale.mV[VX]);
-		draw_center_rect.mBottom = llround(ui_translation.mV[VY] + (F32)draw_center_rect.mBottom * shrink_scale * ui_scale.mV[VY]);
-	}
+			const F32 border_shrink_width = llmax(0.f, draw_center_rect.mLeft - draw_center_rect.mRight);
+			const F32 border_shrink_height = llmax(0.f, draw_center_rect.mBottom - draw_center_rect.mTop);
 
-	LLRectf draw_outer_rect(ui_translation.mV[VX], 
-							ui_translation.mV[VY] + height * ui_scale.mV[VY], 
-							ui_translation.mV[VX] + width * ui_scale.mV[VX], 
-							ui_translation.mV[VY]);
+			const F32 shrink_width_ratio = center_rect.getWidth() == 1.f ? 0.f : border_shrink_width / ((F32)image_natural_width * (1.f - center_rect.getWidth()));
+			const F32 shrink_height_ratio = center_rect.getHeight() == 1.f ? 0.f : border_shrink_height / ((F32)image_natural_height * (1.f - center_rect.getHeight()));
 
-	LLGLSUIDefault gls_ui;
-	
-	if (solid_color)
-	{
-		if (LLGLSLShader::sNoFixedFunction)
-		{
-			gSolidColorProgram.bind();
+			const F32 border_shrink_scale = 1.f - llmax(shrink_width_ratio, shrink_height_ratio);
+			draw_center_rect.mLeft *= border_shrink_scale;
+			draw_center_rect.mTop = lerp((F32)height, (F32)draw_center_rect.mTop, border_shrink_scale);
+			draw_center_rect.mRight = lerp((F32)width, (F32)draw_center_rect.mRight, border_shrink_scale);
+			draw_center_rect.mBottom *= border_shrink_scale;
 		}
 		else
 		{
-			gGL.getTexUnit(0)->setTextureColorBlend(LLTexUnit::TBO_REPLACE, LLTexUnit::TBS_PREV_COLOR);
-			gGL.getTexUnit(0)->setTextureAlphaBlend(LLTexUnit::TBO_MULT, LLTexUnit::TBS_TEX_ALPHA, LLTexUnit::TBS_VERT_ALPHA);
+			// keep center region of image at fixed scale, but in same relative position
+			F32 scale_factor = llmin((F32)width / draw_center_rect.getWidth(), (F32)height / draw_center_rect.getHeight(), 1.f);
+			F32 scaled_width = draw_center_rect.getWidth() * scale_factor;
+			F32 scaled_height = draw_center_rect.getHeight() * scale_factor;
+			draw_center_rect.setCenterAndSize(uv_center_rect.getCenterX() * width, uv_center_rect.getCenterY() * height, scaled_width, scaled_height);
 		}
-	}
 
-	gGL.getTexUnit(0)->bind(image, true);
+		draw_center_rect.mLeft   = llround(ui_translation.mV[VX] + (F32)draw_center_rect.mLeft * ui_scale.mV[VX]);
+		draw_center_rect.mTop    = llround(ui_translation.mV[VY] + (F32)draw_center_rect.mTop * ui_scale.mV[VY]);
+		draw_center_rect.mRight  = llround(ui_translation.mV[VX] + (F32)draw_center_rect.mRight * ui_scale.mV[VX]);
+		draw_center_rect.mBottom = llround(ui_translation.mV[VY] + (F32)draw_center_rect.mBottom * ui_scale.mV[VY]);
 
-	gGL.color4fv(color.mV);
+		LLRectf draw_outer_rect(ui_translation.mV[VX], 
+								ui_translation.mV[VY] + height * ui_scale.mV[VY], 
+								ui_translation.mV[VX] + width * ui_scale.mV[VX], 
+								ui_translation.mV[VY]);
+
+		LLGLSUIDefault gls_ui;
+
+		gGL.getTexUnit(0)->bind(image, true);
+
+		gGL.color4fv(color.mV);
 	
-	const S32 NUM_VERTICES = 9 * 4; // 9 quads
-	LLVector2 uv[NUM_VERTICES];
-	LLVector3 pos[NUM_VERTICES];
+		const S32 NUM_VERTICES = 9 * 4; // 9 quads
+		LLVector2 uv[NUM_VERTICES];
+		LLVector3 pos[NUM_VERTICES];
 
-	S32 index = 0;
+		S32 index = 0;
 
-	gGL.begin(LLRender::QUADS);
-	{
-		// draw bottom left
-		uv[index] = LLVector2(uv_outer_rect.mLeft, uv_outer_rect.mBottom);
-		pos[index] = LLVector3(draw_outer_rect.mLeft, draw_outer_rect.mBottom, 0.f);
-		index++;
+		gGL.begin(LLRender::QUADS);
+		{
+			// draw bottom left
+			uv[index] = LLVector2(uv_outer_rect.mLeft, uv_outer_rect.mBottom);
+			pos[index] = LLVector3(draw_outer_rect.mLeft, draw_outer_rect.mBottom, 0.f);
+			index++;
 
-		uv[index] = LLVector2(uv_center_rect.mLeft, uv_outer_rect.mBottom);
-		pos[index] = LLVector3(draw_center_rect.mLeft, draw_outer_rect.mBottom, 0.f);
-		index++;
+			uv[index] = LLVector2(uv_center_rect.mLeft, uv_outer_rect.mBottom);
+			pos[index] = LLVector3(draw_center_rect.mLeft, draw_outer_rect.mBottom, 0.f);
+			index++;
 
-		uv[index] = LLVector2(uv_center_rect.mLeft, uv_center_rect.mBottom);
-		pos[index] = LLVector3(draw_center_rect.mLeft, draw_center_rect.mBottom, 0.f);
-		index++;
+			uv[index] = LLVector2(uv_center_rect.mLeft, uv_center_rect.mBottom);
+			pos[index] = LLVector3(draw_center_rect.mLeft, draw_center_rect.mBottom, 0.f);
+			index++;
 
-		uv[index] = LLVector2(uv_outer_rect.mLeft, uv_center_rect.mBottom);
-		pos[index] = LLVector3(draw_outer_rect.mLeft, draw_center_rect.mBottom, 0.f);
-		index++;
+			uv[index] = LLVector2(uv_outer_rect.mLeft, uv_center_rect.mBottom);
+			pos[index] = LLVector3(draw_outer_rect.mLeft, draw_center_rect.mBottom, 0.f);
+			index++;
 
-		// draw bottom middle
-		uv[index] = LLVector2(uv_center_rect.mLeft, uv_outer_rect.mBottom);
-		pos[index] = LLVector3(draw_center_rect.mLeft, draw_outer_rect.mBottom, 0.f);
-		index++;
+			// draw bottom middle
+			uv[index] = LLVector2(uv_center_rect.mLeft, uv_outer_rect.mBottom);
+			pos[index] = LLVector3(draw_center_rect.mLeft, draw_outer_rect.mBottom, 0.f);
+			index++;
 
-		uv[index] = LLVector2(uv_center_rect.mRight, uv_outer_rect.mBottom);
-		pos[index] = LLVector3(draw_center_rect.mRight, draw_outer_rect.mBottom, 0.f);
-		index++;
+			uv[index] = LLVector2(uv_center_rect.mRight, uv_outer_rect.mBottom);
+			pos[index] = LLVector3(draw_center_rect.mRight, draw_outer_rect.mBottom, 0.f);
+			index++;
 
-		uv[index] = LLVector2(uv_center_rect.mRight, uv_center_rect.mBottom);
-		pos[index] = LLVector3(draw_center_rect.mRight, draw_center_rect.mBottom, 0.f);
-		index++;
+			uv[index] = LLVector2(uv_center_rect.mRight, uv_center_rect.mBottom);
+			pos[index] = LLVector3(draw_center_rect.mRight, draw_center_rect.mBottom, 0.f);
+			index++;
 
-		uv[index] = LLVector2(uv_center_rect.mLeft, uv_center_rect.mBottom);
-		pos[index] = LLVector3(draw_center_rect.mLeft, draw_center_rect.mBottom, 0.f);
-		index++;
+			uv[index] = LLVector2(uv_center_rect.mLeft, uv_center_rect.mBottom);
+			pos[index] = LLVector3(draw_center_rect.mLeft, draw_center_rect.mBottom, 0.f);
+			index++;
 
-		// draw bottom right
-		uv[index] = LLVector2(uv_center_rect.mRight, uv_outer_rect.mBottom);
-		pos[index] = LLVector3(draw_center_rect.mRight, draw_outer_rect.mBottom, 0.f);
-		index++;
+			// draw bottom right
+			uv[index] = LLVector2(uv_center_rect.mRight, uv_outer_rect.mBottom);
+			pos[index] = LLVector3(draw_center_rect.mRight, draw_outer_rect.mBottom, 0.f);
+			index++;
 
-		uv[index] = LLVector2(uv_outer_rect.mRight, uv_outer_rect.mBottom);
-		pos[index] = LLVector3(draw_outer_rect.mRight, draw_outer_rect.mBottom, 0.f);
-		index++;
+			uv[index] = LLVector2(uv_outer_rect.mRight, uv_outer_rect.mBottom);
+			pos[index] = LLVector3(draw_outer_rect.mRight, draw_outer_rect.mBottom, 0.f);
+			index++;
 
-		uv[index] = LLVector2(uv_outer_rect.mRight, uv_center_rect.mBottom);
-		pos[index] = LLVector3(draw_outer_rect.mRight, draw_center_rect.mBottom, 0.f);
-		index++;
+			uv[index] = LLVector2(uv_outer_rect.mRight, uv_center_rect.mBottom);
+			pos[index] = LLVector3(draw_outer_rect.mRight, draw_center_rect.mBottom, 0.f);
+			index++;
 
-		uv[index] = LLVector2(uv_center_rect.mRight, uv_center_rect.mBottom);
-		pos[index] = LLVector3(draw_center_rect.mRight, draw_center_rect.mBottom, 0.f);
-		index++;
+			uv[index] = LLVector2(uv_center_rect.mRight, uv_center_rect.mBottom);
+			pos[index] = LLVector3(draw_center_rect.mRight, draw_center_rect.mBottom, 0.f);
+			index++;
 
-		// draw left 
-		uv[index] = LLVector2(uv_outer_rect.mLeft, uv_center_rect.mBottom);
-		pos[index] = LLVector3(draw_outer_rect.mLeft, draw_center_rect.mBottom, 0.f);
-		index++;
+			// draw left 
+			uv[index] = LLVector2(uv_outer_rect.mLeft, uv_center_rect.mBottom);
+			pos[index] = LLVector3(draw_outer_rect.mLeft, draw_center_rect.mBottom, 0.f);
+			index++;
 
-		uv[index] = LLVector2(uv_center_rect.mLeft, uv_center_rect.mBottom);
-		pos[index] = LLVector3(draw_center_rect.mLeft, draw_center_rect.mBottom, 0.f);
-		index++;
+			uv[index] = LLVector2(uv_center_rect.mLeft, uv_center_rect.mBottom);
+			pos[index] = LLVector3(draw_center_rect.mLeft, draw_center_rect.mBottom, 0.f);
+			index++;
 
-		uv[index] = LLVector2(uv_center_rect.mLeft, uv_center_rect.mTop);
-		pos[index] = LLVector3(draw_center_rect.mLeft, draw_center_rect.mTop, 0.f);
-		index++;
+			uv[index] = LLVector2(uv_center_rect.mLeft, uv_center_rect.mTop);
+			pos[index] = LLVector3(draw_center_rect.mLeft, draw_center_rect.mTop, 0.f);
+			index++;
 
-		uv[index] = LLVector2(uv_outer_rect.mLeft, uv_center_rect.mTop);
-		pos[index] = LLVector3(draw_outer_rect.mLeft, draw_center_rect.mTop, 0.f);
-		index++;
+			uv[index] = LLVector2(uv_outer_rect.mLeft, uv_center_rect.mTop);
+			pos[index] = LLVector3(draw_outer_rect.mLeft, draw_center_rect.mTop, 0.f);
+			index++;
 
-		// draw middle
-		uv[index] = LLVector2(uv_center_rect.mLeft, uv_center_rect.mBottom);
-		pos[index] = LLVector3(draw_center_rect.mLeft, draw_center_rect.mBottom, 0.f);
-		index++;
+			// draw middle
+			uv[index] = LLVector2(uv_center_rect.mLeft, uv_center_rect.mBottom);
+			pos[index] = LLVector3(draw_center_rect.mLeft, draw_center_rect.mBottom, 0.f);
+			index++;
 
-		uv[index] = LLVector2(uv_center_rect.mRight, uv_center_rect.mBottom);
-		pos[index] = LLVector3(draw_center_rect.mRight, draw_center_rect.mBottom, 0.f);
-		index++;
+			uv[index] = LLVector2(uv_center_rect.mRight, uv_center_rect.mBottom);
+			pos[index] = LLVector3(draw_center_rect.mRight, draw_center_rect.mBottom, 0.f);
+			index++;
 
-		uv[index] = LLVector2(uv_center_rect.mRight, uv_center_rect.mTop);
-		pos[index] = LLVector3(draw_center_rect.mRight, draw_center_rect.mTop, 0.f);
-		index++;
+			uv[index] = LLVector2(uv_center_rect.mRight, uv_center_rect.mTop);
+			pos[index] = LLVector3(draw_center_rect.mRight, draw_center_rect.mTop, 0.f);
+			index++;
 
-		uv[index] = LLVector2(uv_center_rect.mLeft, uv_center_rect.mTop);
-		pos[index] = LLVector3(draw_center_rect.mLeft, draw_center_rect.mTop, 0.f);
-		index++;
+			uv[index] = LLVector2(uv_center_rect.mLeft, uv_center_rect.mTop);
+			pos[index] = LLVector3(draw_center_rect.mLeft, draw_center_rect.mTop, 0.f);
+			index++;
 
-		// draw right 
-		uv[index] = LLVector2(uv_center_rect.mRight, uv_center_rect.mBottom);
-		pos[index] = LLVector3(draw_center_rect.mRight, draw_center_rect.mBottom, 0.f);
-		index++;
+			// draw right 
+			uv[index] = LLVector2(uv_center_rect.mRight, uv_center_rect.mBottom);
+			pos[index] = LLVector3(draw_center_rect.mRight, draw_center_rect.mBottom, 0.f);
+			index++;
 
-		uv[index] = LLVector2(uv_outer_rect.mRight, uv_center_rect.mBottom);
-		pos[index] = LLVector3(draw_outer_rect.mRight, draw_center_rect.mBottom, 0.f);
-		index++;
+			uv[index] = LLVector2(uv_outer_rect.mRight, uv_center_rect.mBottom);
+			pos[index] = LLVector3(draw_outer_rect.mRight, draw_center_rect.mBottom, 0.f);
+			index++;
 
-		uv[index] = LLVector2(uv_outer_rect.mRight, uv_center_rect.mTop);
-		pos[index] = LLVector3(draw_outer_rect.mRight, draw_center_rect.mTop, 0.f);
-		index++;
+			uv[index] = LLVector2(uv_outer_rect.mRight, uv_center_rect.mTop);
+			pos[index] = LLVector3(draw_outer_rect.mRight, draw_center_rect.mTop, 0.f);
+			index++;
 
-		uv[index] = LLVector2(uv_center_rect.mRight, uv_center_rect.mTop);
-		pos[index] = LLVector3(draw_center_rect.mRight, draw_center_rect.mTop, 0.f);
-		index++;
+			uv[index] = LLVector2(uv_center_rect.mRight, uv_center_rect.mTop);
+			pos[index] = LLVector3(draw_center_rect.mRight, draw_center_rect.mTop, 0.f);
+			index++;
 
-		// draw top left
-		uv[index] = LLVector2(uv_outer_rect.mLeft, uv_center_rect.mTop);
-		pos[index] = LLVector3(draw_outer_rect.mLeft, draw_center_rect.mTop, 0.f);
-		index++;
+			// draw top left
+			uv[index] = LLVector2(uv_outer_rect.mLeft, uv_center_rect.mTop);
+			pos[index] = LLVector3(draw_outer_rect.mLeft, draw_center_rect.mTop, 0.f);
+			index++;
 
-		uv[index] = LLVector2(uv_center_rect.mLeft, uv_center_rect.mTop);
-		pos[index] = LLVector3(draw_center_rect.mLeft, draw_center_rect.mTop, 0.f);
-		index++;
+			uv[index] = LLVector2(uv_center_rect.mLeft, uv_center_rect.mTop);
+			pos[index] = LLVector3(draw_center_rect.mLeft, draw_center_rect.mTop, 0.f);
+			index++;
 
-		uv[index] = LLVector2(uv_center_rect.mLeft, uv_outer_rect.mTop);
-		pos[index] = LLVector3(draw_center_rect.mLeft, draw_outer_rect.mTop, 0.f);
-		index++;
+			uv[index] = LLVector2(uv_center_rect.mLeft, uv_outer_rect.mTop);
+			pos[index] = LLVector3(draw_center_rect.mLeft, draw_outer_rect.mTop, 0.f);
+			index++;
 
-		uv[index] = LLVector2(uv_outer_rect.mLeft, uv_outer_rect.mTop);
-		pos[index] = LLVector3(draw_outer_rect.mLeft, draw_outer_rect.mTop, 0.f);
-		index++;
+			uv[index] = LLVector2(uv_outer_rect.mLeft, uv_outer_rect.mTop);
+			pos[index] = LLVector3(draw_outer_rect.mLeft, draw_outer_rect.mTop, 0.f);
+			index++;
 
-		// draw top middle
-		uv[index] = LLVector2(uv_center_rect.mLeft, uv_center_rect.mTop);
-		pos[index] = LLVector3(draw_center_rect.mLeft, draw_center_rect.mTop, 0.f);
-		index++;
+			// draw top middle
+			uv[index] = LLVector2(uv_center_rect.mLeft, uv_center_rect.mTop);
+			pos[index] = LLVector3(draw_center_rect.mLeft, draw_center_rect.mTop, 0.f);
+			index++;
 
-		uv[index] = LLVector2(uv_center_rect.mRight, uv_center_rect.mTop);
-		pos[index] = LLVector3(draw_center_rect.mRight, draw_center_rect.mTop, 0.f);
-		index++;
+			uv[index] = LLVector2(uv_center_rect.mRight, uv_center_rect.mTop);
+			pos[index] = LLVector3(draw_center_rect.mRight, draw_center_rect.mTop, 0.f);
+			index++;
 
-		uv[index] = LLVector2(uv_center_rect.mRight, uv_outer_rect.mTop);
-		pos[index] = LLVector3(draw_center_rect.mRight, draw_outer_rect.mTop, 0.f);
-		index++;
+			uv[index] = LLVector2(uv_center_rect.mRight, uv_outer_rect.mTop);
+			pos[index] = LLVector3(draw_center_rect.mRight, draw_outer_rect.mTop, 0.f);
+			index++;
 
-		uv[index] = LLVector2(uv_center_rect.mLeft, uv_outer_rect.mTop);
-		pos[index] = LLVector3(draw_center_rect.mLeft, draw_outer_rect.mTop, 0.f);
-		index++;
+			uv[index] = LLVector2(uv_center_rect.mLeft, uv_outer_rect.mTop);
+			pos[index] = LLVector3(draw_center_rect.mLeft, draw_outer_rect.mTop, 0.f);
+			index++;
 
-		// draw top right
-		uv[index] = LLVector2(uv_center_rect.mRight, uv_center_rect.mTop);
-		pos[index] = LLVector3(draw_center_rect.mRight, draw_center_rect.mTop, 0.f);
-		index++;
+			// draw top right
+			uv[index] = LLVector2(uv_center_rect.mRight, uv_center_rect.mTop);
+			pos[index] = LLVector3(draw_center_rect.mRight, draw_center_rect.mTop, 0.f);
+			index++;
 
-		uv[index] = LLVector2(uv_outer_rect.mRight, uv_center_rect.mTop);
-		pos[index] = LLVector3(draw_outer_rect.mRight, draw_center_rect.mTop, 0.f);
-		index++;
+			uv[index] = LLVector2(uv_outer_rect.mRight, uv_center_rect.mTop);
+			pos[index] = LLVector3(draw_outer_rect.mRight, draw_center_rect.mTop, 0.f);
+			index++;
 
-		uv[index] = LLVector2(uv_outer_rect.mRight, uv_outer_rect.mTop);
-		pos[index] = LLVector3(draw_outer_rect.mRight, draw_outer_rect.mTop, 0.f);
-		index++;
+			uv[index] = LLVector2(uv_outer_rect.mRight, uv_outer_rect.mTop);
+			pos[index] = LLVector3(draw_outer_rect.mRight, draw_outer_rect.mTop, 0.f);
+			index++;
 
-		uv[index] = LLVector2(uv_center_rect.mRight, uv_outer_rect.mTop);
-		pos[index] = LLVector3(draw_center_rect.mRight, draw_outer_rect.mTop, 0.f);
-		index++;
+			uv[index] = LLVector2(uv_center_rect.mRight, uv_outer_rect.mTop);
+			pos[index] = LLVector3(draw_center_rect.mRight, draw_outer_rect.mTop, 0.f);
+			index++;
 
-		gGL.vertexBatchPreTransformed(pos, uv, NUM_VERTICES);
+			gGL.vertexBatchPreTransformed(pos, uv, NUM_VERTICES);
+		}
+		gGL.end();
 	}
-	gGL.end();
 
 	if (solid_color)
 	{
@@ -639,18 +668,24 @@ void gl_draw_rotated_image(S32 x, S32 y, F32 degrees, LLTexture* image, const LL
 	gl_draw_scaled_rotated_image( x, y, image->getWidth(0), image->getHeight(0), degrees, image, color, uv_rect );
 }
 
-void gl_draw_scaled_rotated_image(S32 x, S32 y, S32 width, S32 height, F32 degrees, LLTexture* image, const LLColor4& color, const LLRectf& uv_rect)
+void gl_draw_scaled_rotated_image(S32 x, S32 y, S32 width, S32 height, F32 degrees, LLTexture* image, const LLColor4& color, const LLRectf& uv_rect, LLRenderTarget* target)
 {
-	if (NULL == image)
+	if (!image && !target)
 	{
-		llwarns << "image == NULL; aborting function" << llendl;
+		LL_WARNS() << "image == NULL; aborting function" << LL_ENDL;
 		return;
 	}
 
 	LLGLSUIDefault gls_ui;
 
-
-	gGL.getTexUnit(0)->bind(image, true);
+	if(image != NULL)
+	{
+		gGL.getTexUnit(0)->bind(image, true);
+	}
+	else
+	{
+		gGL.getTexUnit(0)->bind(target);
+	}
 
 	gGL.color4fv(color.mV);
 
@@ -695,18 +730,25 @@ void gl_draw_scaled_rotated_image(S32 x, S32 y, S32 width, S32 height, F32 degre
 	{
 		gGL.pushUIMatrix();
 		gGL.translateUI((F32)x, (F32)y, 0.f);
-	
+
 		F32 offset_x = F32(width/2);
 		F32 offset_y = F32(height/2);
 
 		gGL.translateUI(offset_x, offset_y, 0.f);
 
 		LLMatrix3 quat(0.f, 0.f, degrees*DEG_TO_RAD);
-		
-		gGL.getTexUnit(0)->bind(image, true);
+
+		if(image != NULL)
+		{
+			gGL.getTexUnit(0)->bind(image, true);
+		}
+		else
+		{
+			gGL.getTexUnit(0)->bind(target);
+		}
 
 		gGL.color4fv(color.mV);
-		
+
 		gGL.begin(LLRender::QUADS);
 		{
 			LLVector3 v;
@@ -732,7 +774,6 @@ void gl_draw_scaled_rotated_image(S32 x, S32 y, S32 width, S32 height, F32 degre
 	}
 }
 
-
 void gl_stippled_line_3d( const LLVector3& start, const LLVector3& end, const LLColor4& color, F32 phase )
 {
 	phase = fmod(phase, 1.f);
@@ -1044,6 +1085,8 @@ void gl_rect_2d_simple( S32 width, S32 height )
 	gGL.end();
 }
 
+static LLTrace::BlockTimerStatHandle FTM_RENDER_SEGMENTED_RECT ("Render segmented rectangle");
+
 void gl_segmented_rect_2d_tex(const S32 left, 
 							  const S32 top, 
 							  const S32 right, 
@@ -1053,6 +1096,8 @@ void gl_segmented_rect_2d_tex(const S32 left,
 							  const S32 border_size, 
 							  const U32 edges)
 {
+	LL_RECORD_BLOCK_TIME(FTM_RENDER_SEGMENTED_RECT);
+
 	S32 width = llabs(right - left);
 	S32 height = llabs(top - bottom);
 
@@ -1202,18 +1247,19 @@ void gl_segmented_rect_2d_tex(const S32 left,
 	gGL.popUIMatrix();
 }
 
-//FIXME: rewrite to use scissor?
-void gl_segmented_rect_2d_fragment_tex(const S32 left, 
-									   const S32 top, 
-									   const S32 right, 
-									   const S32 bottom, 
-									   const S32 texture_width, 
-									   const S32 texture_height, 
-									   const S32 border_size, 
-									   const F32 start_fragment, 
-									   const F32 end_fragment, 
-									   const U32 edges)
+void gl_segmented_rect_2d_fragment_tex(const LLRect& rect, 
+	const S32 texture_width, 
+	const S32 texture_height, 
+	const S32 border_size, 
+	const F32 start_fragment, 
+	const F32 end_fragment, 
+	const U32 edges)
 {
+	LL_RECORD_BLOCK_TIME(FTM_RENDER_SEGMENTED_RECT);
+	const S32 left = rect.mLeft;
+	const S32 right = rect.mRight;
+	const S32 top = rect.mTop;
+	const S32 bottom = rect.mBottom;
 	S32 width = llabs(right - left);
 	S32 height = llabs(top - bottom);
 
@@ -1251,9 +1297,9 @@ void gl_segmented_rect_2d_fragment_tex(const S32 left,
 	{
 		if (start_fragment < middle_start)
 		{
-			u_min = (start_fragment / middle_start) * border_uv_scale.mV[VX];
+			u_min = (start_fragment / middle_start)			* border_uv_scale.mV[VX];
 			u_max = llmin(end_fragment / middle_start, 1.f) * border_uv_scale.mV[VX];
-			x_min = (start_fragment / middle_start) * border_width_left;
+			x_min = (start_fragment / middle_start)			* border_width_left;
 			x_max = llmin(end_fragment / middle_start, 1.f) * border_width_left;
 
 			// draw bottom left
@@ -1281,7 +1327,7 @@ void gl_segmented_rect_2d_fragment_tex(const S32 left,
 
 			gGL.texCoord2f(u_min, 1.f - border_uv_scale.mV[VY]);
 			gGL.vertex2fv((x_min + height_vec - border_height_top).mV);
-			
+
 			// draw top left
 			gGL.texCoord2f(u_min, 1.f - border_uv_scale.mV[VY]);
 			gGL.vertex2fv((x_min + height_vec - border_height_top).mV);
@@ -1343,10 +1389,10 @@ void gl_segmented_rect_2d_fragment_tex(const S32 left,
 
 		if (end_fragment > middle_end)
 		{
-			u_min = (1.f - llmax(0.f, ((start_fragment - middle_end) / middle_start))) * border_uv_scale.mV[VX];
-			u_max = (1.f - ((end_fragment - middle_end) / middle_start)) * border_uv_scale.mV[VX];
-			x_min = width_vec - ((1.f - llmax(0.f, ((start_fragment - middle_end) / middle_start))) * border_width_right);
-			x_max = width_vec - ((1.f - ((end_fragment - middle_end) / middle_start)) * border_width_right);
+			u_min = 1.f			- ((1.f - llmax(0.f, (start_fragment - middle_end) / middle_start)) * border_uv_scale.mV[VX]);
+			u_max = 1.f			- ((1.f - ((end_fragment - middle_end) / middle_start)) * border_uv_scale.mV[VX]);
+			x_min = width_vec	- ((1.f - llmax(0.f, (start_fragment - middle_end) / middle_start)) * border_width_right);
+			x_max = width_vec	- ((1.f - ((end_fragment - middle_end) / middle_start)) * border_width_right);
 
 			// draw bottom right
 			gGL.texCoord2f(u_min, 0.f);
@@ -1396,6 +1442,8 @@ void gl_segmented_rect_2d_fragment_tex(const S32 left,
 void gl_segmented_rect_3d_tex(const LLRectf& clip_rect, const LLRectf& center_uv_rect, const LLRectf& center_draw_rect, 
 							 const LLVector3& width_vec, const LLVector3& height_vec)
 {
+	LL_RECORD_BLOCK_TIME(FTM_RENDER_SEGMENTED_RECT);
+
 	gGL.begin(LLRender::QUADS);
 	{
 		// draw bottom left