diff options
author | Jacek Antonelli | 2008-08-15 23:44:56 -0500 |
---|---|---|
committer | Jacek Antonelli | 2008-08-15 23:44:56 -0500 |
commit | c07901e29ed545bbb02e3bddf148fe1104b94e9f (patch) | |
tree | f1ada64ce834acd7d92a425efb96c4b86bcf16b1 /linden/indra/newview/llviewerdisplay.cpp | |
parent | Second Life viewer sources 1.15.0.2 (diff) | |
download | meta-impy-c07901e29ed545bbb02e3bddf148fe1104b94e9f.zip meta-impy-c07901e29ed545bbb02e3bddf148fe1104b94e9f.tar.gz meta-impy-c07901e29ed545bbb02e3bddf148fe1104b94e9f.tar.bz2 meta-impy-c07901e29ed545bbb02e3bddf148fe1104b94e9f.tar.xz |
Second Life viewer sources 1.15.1.3
Diffstat (limited to 'linden/indra/newview/llviewerdisplay.cpp')
-rw-r--r-- | linden/indra/newview/llviewerdisplay.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
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) | |||
564 | glPushMatrix(); | 564 | glPushMatrix(); |
565 | glMatrixMode(GL_MODELVIEW); | 565 | glMatrixMode(GL_MODELVIEW); |
566 | glPushMatrix(); | 566 | glPushMatrix(); |
567 | |||
567 | if (LLPipeline::sShowHUDAttachments && !gDisconnected && setup_hud_matrices(FALSE)) | 568 | if (LLPipeline::sShowHUDAttachments && !gDisconnected && setup_hud_matrices(FALSE)) |
568 | { | 569 | { |
569 | LLCamera hud_cam = *gCamera; | 570 | LLCamera hud_cam = *gCamera; |
@@ -598,7 +599,7 @@ void display(BOOL rebuild, F32 zoom_factor, int subfield) | |||
598 | LLFastTimer ftm(LLFastTimer::FTM_REBUILD); | 599 | LLFastTimer ftm(LLFastTimer::FTM_REBUILD); |
599 | gPipeline.stateSort(hud_cam); | 600 | gPipeline.stateSort(hud_cam); |
600 | } | 601 | } |
601 | 602 | ||
602 | gPipeline.renderGeom(hud_cam); | 603 | gPipeline.renderGeom(hud_cam); |
603 | 604 | ||
604 | //restore type mask | 605 | //restore type mask |
@@ -657,6 +658,7 @@ BOOL setup_hud_matrices(BOOL for_select) | |||
657 | } | 658 | } |
658 | LLBBox hud_bbox = my_avatarp->getHUDBBox(); | 659 | LLBBox hud_bbox = my_avatarp->getHUDBBox(); |
659 | 660 | ||
661 | |||
660 | // set up transform to encompass bounding box of HUD | 662 | // set up transform to encompass bounding box of HUD |
661 | glMatrixMode(GL_PROJECTION); | 663 | glMatrixMode(GL_PROJECTION); |
662 | glLoadIdentity(); | 664 | glLoadIdentity(); |
@@ -685,7 +687,7 @@ BOOL setup_hud_matrices(BOOL for_select) | |||
685 | glLoadMatrixf(OGL_TO_CFR_ROTATION); // Load Cory's favorite reference frame | 687 | glLoadMatrixf(OGL_TO_CFR_ROTATION); // Load Cory's favorite reference frame |
686 | glTranslatef(-hud_bbox.getCenterLocal().mV[VX] + (hud_depth * 0.5f), 0.f, 0.f); | 688 | glTranslatef(-hud_bbox.getCenterLocal().mV[VX] + (hud_depth * 0.5f), 0.f, 0.f); |
687 | glScalef(zoom_level, zoom_level, zoom_level); | 689 | glScalef(zoom_level, zoom_level, zoom_level); |
688 | 690 | ||
689 | return TRUE; | 691 | return TRUE; |
690 | } | 692 | } |
691 | else | 693 | else |