diff options
| author | Dave Parks <davep@lindenlab.com> | 2010-03-12 13:01:50 -0600 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2010-03-12 13:01:50 -0600 |
| commit | 58afe469f9d29aea0d3d974ac112725ddbaa3a19 (patch) | |
| tree | 1b2205662a07c8e555ddecb9f09b2cdc3d74bb4e /indra/llui/llview.cpp | |
| parent | f5c431aa7bce953503b33c957ba024bdd9104e63 (diff) | |
Bizarrely hacky fix for EXT-6276 (#if LL_DARWIN out copyFromPrimarySubstring)
General gl state cleanup in llui.
Make llrender more gGL.begin/end friendly.
Diffstat (limited to 'indra/llui/llview.cpp')
| -rw-r--r-- | indra/llui/llview.cpp | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/indra/llui/llview.cpp b/indra/llui/llview.cpp index d34083a384..d0dbc99bc7 100644 --- a/indra/llui/llview.cpp +++ b/indra/llui/llview.cpp @@ -1325,7 +1325,6 @@ void LLView::drawChildren() localRectToScreen(viewp->getRect(),&screenRect); if ( rootRect.overlaps(screenRect) && LLUI::sDirtyRect.overlaps(screenRect)) { - glMatrixMode(GL_MODELVIEW); LLUI::pushMatrix(); { LLUI::translate((F32)viewp->getRect().mLeft, (F32)viewp->getRect().mBottom, 0.f); @@ -1349,8 +1348,6 @@ void LLView::drawChildren() } --sDepth; } - - gGL.getTexUnit(0)->disable(); } void LLView::dirtyRect() |