diff options
| author | Dave Parks <davep@lindenlab.com> | 2010-02-04 23:43:13 -0600 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2010-02-04 23:43:13 -0600 |
| commit | ff0271d632eb59fef1dc52ff261064b6a09abefa (patch) | |
| tree | f1554768fa9f1dfcb84f3df0f7aeaa35172080b2 /indra/newview/llmediactrl.cpp | |
| parent | 7d2d8ea58f572a6df08b04f64f3b71501ee21f6c (diff) | |
| parent | 979ddb2ec952f836f7cde7cbc85559b8e9582416 (diff) | |
merge
Diffstat (limited to 'indra/newview/llmediactrl.cpp')
| -rw-r--r-- | indra/newview/llmediactrl.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/indra/newview/llmediactrl.cpp b/indra/newview/llmediactrl.cpp index 3c34d26692..f9a013b2b1 100644 --- a/indra/newview/llmediactrl.cpp +++ b/indra/newview/llmediactrl.cpp @@ -724,14 +724,14 @@ void LLMediaCtrl::draw() LLGLSUIDefault gls_ui; LLGLDisable gls_alphaTest( GL_ALPHA_TEST ); - gGL.pushMatrix(); + gGL.pushUIMatrix(); { if (mIgnoreUIScale) { - glLoadIdentity(); + gGL.loadUIIdentity(); // font system stores true screen origin, need to scale this by UI scale factor // to get render origin for this view (with unit scale) - gGL.translatef(floorf(LLFontGL::sCurOrigin.mX * LLUI::sGLScaleFactor.mV[VX]), + gGL.translateUI(floorf(LLFontGL::sCurOrigin.mX * LLUI::sGLScaleFactor.mV[VX]), floorf(LLFontGL::sCurOrigin.mY * LLUI::sGLScaleFactor.mV[VY]), LLFontGL::sCurOrigin.mZ); } @@ -825,7 +825,7 @@ void LLMediaCtrl::draw() gGL.end(); gGL.setSceneBlendType(LLRender::BT_ALPHA); } - gGL.popMatrix(); + gGL.popUIMatrix(); } else |