From c07901e29ed545bbb02e3bddf148fe1104b94e9f Mon Sep 17 00:00:00 2001 From: Jacek Antonelli Date: Fri, 15 Aug 2008 23:44:56 -0500 Subject: Second Life viewer sources 1.15.1.3 --- linden/indra/newview/llviewerdisplay.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'linden/indra/newview/llviewerdisplay.cpp') diff --git a/linden/indra/newview/llviewerdisplay.cpp b/linden/indra/newview/llviewerdisplay.cpp index c2ef30a..fc288c0 100644 --- a/linden/indra/newview/llviewerdisplay.cpp +++ b/linden/indra/newview/llviewerdisplay.cpp @@ -564,6 +564,7 @@ void display(BOOL rebuild, F32 zoom_factor, int subfield) glPushMatrix(); glMatrixMode(GL_MODELVIEW); glPushMatrix(); + if (LLPipeline::sShowHUDAttachments && !gDisconnected && setup_hud_matrices(FALSE)) { LLCamera hud_cam = *gCamera; @@ -598,7 +599,7 @@ void display(BOOL rebuild, F32 zoom_factor, int subfield) LLFastTimer ftm(LLFastTimer::FTM_REBUILD); gPipeline.stateSort(hud_cam); } - + gPipeline.renderGeom(hud_cam); //restore type mask @@ -657,6 +658,7 @@ BOOL setup_hud_matrices(BOOL for_select) } LLBBox hud_bbox = my_avatarp->getHUDBBox(); + // set up transform to encompass bounding box of HUD glMatrixMode(GL_PROJECTION); glLoadIdentity(); @@ -685,7 +687,7 @@ BOOL setup_hud_matrices(BOOL for_select) glLoadMatrixf(OGL_TO_CFR_ROTATION); // Load Cory's favorite reference frame glTranslatef(-hud_bbox.getCenterLocal().mV[VX] + (hud_depth * 0.5f), 0.f, 0.f); glScalef(zoom_level, zoom_level, zoom_level); - + return TRUE; } else -- cgit v1.1