diff options
Diffstat (limited to '')
-rw-r--r-- | linden/indra/newview/llwebbrowserctrl.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/linden/indra/newview/llwebbrowserctrl.cpp b/linden/indra/newview/llwebbrowserctrl.cpp index fbbd827..710b7e1 100644 --- a/linden/indra/newview/llwebbrowserctrl.cpp +++ b/linden/indra/newview/llwebbrowserctrl.cpp | |||
@@ -568,14 +568,14 @@ void LLWebBrowserCtrl::draw() | |||
568 | LLGLSUIDefault gls_ui; | 568 | LLGLSUIDefault gls_ui; |
569 | LLGLDisable gls_alphaTest( GL_ALPHA_TEST ); | 569 | LLGLDisable gls_alphaTest( GL_ALPHA_TEST ); |
570 | 570 | ||
571 | glPushMatrix(); | 571 | gGL.pushMatrix(); |
572 | { | 572 | { |
573 | if (mIgnoreUIScale) | 573 | if (mIgnoreUIScale) |
574 | { | 574 | { |
575 | glLoadIdentity(); | 575 | glLoadIdentity(); |
576 | // font system stores true screen origin, need to scale this by UI scale factor | 576 | // font system stores true screen origin, need to scale this by UI scale factor |
577 | // to get render origin for this view (with unit scale) | 577 | // to get render origin for this view (with unit scale) |
578 | glTranslatef(floorf(LLFontGL::sCurOrigin.mX * LLUI::sGLScaleFactor.mV[VX]), | 578 | gGL.translatef(floorf(LLFontGL::sCurOrigin.mX * LLUI::sGLScaleFactor.mV[VX]), |
579 | floorf(LLFontGL::sCurOrigin.mY * LLUI::sGLScaleFactor.mV[VY]), | 579 | floorf(LLFontGL::sCurOrigin.mY * LLUI::sGLScaleFactor.mV[VY]), |
580 | LLFontGL::sCurOrigin.mZ); | 580 | LLFontGL::sCurOrigin.mZ); |
581 | } | 581 | } |
@@ -588,7 +588,7 @@ void LLWebBrowserCtrl::draw() | |||
588 | 588 | ||
589 | // draw the browser | 589 | // draw the browser |
590 | gGL.blendFunc( GL_ONE, GL_ZERO ); | 590 | gGL.blendFunc( GL_ONE, GL_ZERO ); |
591 | gGL.begin( GL_QUADS ); | 591 | gGL.begin( LLVertexBuffer::QUADS ); |
592 | { | 592 | { |
593 | // render using web browser reported width and height, instead of trying to invert GL scale | 593 | // render using web browser reported width and height, instead of trying to invert GL scale |
594 | gGL.texCoord2f( max_u, max_v ); | 594 | gGL.texCoord2f( max_u, max_v ); |
@@ -606,7 +606,7 @@ void LLWebBrowserCtrl::draw() | |||
606 | gGL.end(); | 606 | gGL.end(); |
607 | gGL.blendFunc( GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA ); | 607 | gGL.blendFunc( GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA ); |
608 | } | 608 | } |
609 | glPopMatrix(); | 609 | gGL.popMatrix(); |
610 | 610 | ||
611 | // highlight if keyboard focus here. (TODO: this needs some work) | 611 | // highlight if keyboard focus here. (TODO: this needs some work) |
612 | if ( mBorder->getVisible() ) | 612 | if ( mBorder->getVisible() ) |