Automated merge up from viewer-development into mesh-development

1 files changed, 18 insertions, 14 deletions

diff --git a/indra/newview/llviewerdisplay.cpp b/indra/newview/llviewerdisplay.cpp
index 8ad38c1789..97d6a222c5 100644
--- a/indra/newview/llviewerdisplay.cpp
+++ b/indra/newview/llviewerdisplay.cpp
@@ -647,8 +647,7 @@ void display(BOOL rebuild, F32 zoom_factor, int subfield, BOOL for_snapshot)
 		LLGLState::checkTextureChannels();

 		LLGLState::checkClientArrays();

 

-		BOOL to_texture = !for_snapshot &&

-						gPipeline.canUseVertexShaders() &&

+		BOOL to_texture = gPipeline.canUseVertexShaders() &&

 						LLPipeline::sRenderGlow;

 

 		LLAppViewer::instance()->pingMainloopTimeout("Display:Swap");

@@ -709,7 +708,7 @@ void display(BOOL rebuild, F32 zoom_factor, int subfield, BOOL for_snapshot)
 			glClear(GL_DEPTH_BUFFER_BIT | GL_STENCIL_BUFFER_BIT);

 		}

 

-		if (!for_snapshot)

+		//if (!for_snapshot)

 		{

 			LLMemType mt_gw(LLMemType::MTYPE_DISPLAY_GEN_REFLECTION);

 			LLAppViewer::instance()->pingMainloopTimeout("Display:Imagery");

@@ -1062,8 +1061,7 @@ LLRect get_whole_screen_region()
 		S32 tile_height = llround((F32)gViewerWindow->getWorldViewHeightScaled() / zoom_factor);

 		int tile_y = sub_region / num_horizontal_tiles;

 		int tile_x = sub_region - (tile_y * num_horizontal_tiles);

-		glh::matrix4f mat;

-		

+			

 		whole_screen.setLeftTopAndSize(tile_x * tile_width, gViewerWindow->getWorldViewHeightScaled() - (tile_y * tile_height), tile_width, tile_height);

 	}

 	return whole_screen;

@@ -1143,10 +1141,14 @@ void render_ui(F32 zoom_factor, int subfield)
 	LLMemType mt_ru(LLMemType::MTYPE_DISPLAY_RENDER_UI);

 	LLGLState::checkStates();

 	

-	glPushMatrix();

-	glLoadMatrixd(gGLLastModelView);

 	glh::matrix4f saved_view = glh_get_current_modelview();

-	glh_set_current_modelview(glh_copy_matrix(gGLLastModelView));

+

+	if (!gSnapshot)

+	{

+		glPushMatrix();

+		glLoadMatrixd(gGLLastModelView);

+		glh_set_current_modelview(glh_copy_matrix(gGLLastModelView));

+	}

 	

 	{

 		BOOL to_texture = gPipeline.canUseVertexShaders() &&

@@ -1197,8 +1199,11 @@ void render_ui(F32 zoom_factor, int subfield)
 		LLVertexBuffer::unbind();

 	}

 

-	glh_set_current_modelview(saved_view);

-	glPopMatrix();

+	if (!gSnapshot)

+	{

+		glh_set_current_modelview(saved_view);

+		glPopMatrix();

+	}

 

 	if (gDisplaySwapBuffers)

 	{

@@ -1340,7 +1345,7 @@ void render_ui_2d()
 	// render outline for HUD

 	if (isAgentAvatarValid() && gAgentCamera.mHUDCurZoom < 0.98f)

 	{

-		glPushMatrix();

+		gGL.pushMatrix();

 		S32 half_width = (gViewerWindow->getWorldViewWidthScaled() / 2);

 		S32 half_height = (gViewerWindow->getWorldViewHeightScaled() / 2);

 		glScalef(LLUI::sGLScaleFactor.mV[0], LLUI::sGLScaleFactor.mV[1], 1.f);

@@ -1349,7 +1354,7 @@ void render_ui_2d()
 		glScalef(zoom,zoom,1.f);

 		gGL.color4fv(LLColor4::white.mV);

 		gl_rect_2d(-half_width, half_height, half_width, -half_height, FALSE);

-		glPopMatrix();

+		gGL.popMatrix();

 		stop_glerror();

 	}

 	

@@ -1397,8 +1402,7 @@ void render_ui_2d()
 			gGL.setColorMask(true, false);

 

 			LLUI::sDirtyRect = t_rect;

-			

-	}

+		}

 

 		LLGLDisable cull(GL_CULL_FACE);

 		LLGLDisable blend(GL_BLEND);