diff options
| author | Richard Linden <none@none> | 2010-10-08 14:27:42 -0700 |
|---|---|---|
| committer | Richard Linden <none@none> | 2010-10-08 14:27:42 -0700 |
| commit | bd4afcfba29a763d2253b59a86ec48228a1c6fa8 (patch) | |
| tree | 70e96647bbbeed2afa73a36e16e18e7697a0b738 /indra/newview/llviewerwindow.cpp | |
| parent | 6c0e9432d027dfb363baf4eaff79a835e3e75b37 (diff) | |
EXP-137 FIXED Nametag text and borders do not align in Skylight Viewer
fix for prim media and hud text incorrect positioning when destination guide is open
Diffstat (limited to 'indra/newview/llviewerwindow.cpp')
| -rw-r--r-- | indra/newview/llviewerwindow.cpp | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/indra/newview/llviewerwindow.cpp b/indra/newview/llviewerwindow.cpp index c6ed3f8979..b49d342126 100644 --- a/indra/newview/llviewerwindow.cpp +++ b/indra/newview/llviewerwindow.cpp @@ -4262,17 +4262,8 @@ void LLViewerWindow::setup3DRender() void LLViewerWindow::setup3DViewport(S32 x_offset, S32 y_offset) { - if (LLRenderTarget::getCurrentBoundTarget() != NULL) - { - // don't use translation component of mWorldViewRectRaw, as we are already in a properly sized render target - gGLViewport[0] = x_offset; - gGLViewport[1] = y_offset; - } - else - { - gGLViewport[0] = mWorldViewRectRaw.mLeft + x_offset; - gGLViewport[1] = mWorldViewRectRaw.mBottom + y_offset; - } + gGLViewport[0] = mWorldViewRectRaw.mLeft + x_offset; + gGLViewport[1] = mWorldViewRectRaw.mBottom + y_offset; gGLViewport[2] = mWorldViewRectRaw.getWidth(); gGLViewport[3] = mWorldViewRectRaw.getHeight(); glViewport(gGLViewport[0], gGLViewport[1], gGLViewport[2], gGLViewport[3]); |
