diff options
author | Jacek Antonelli | 2008-08-15 23:45:49 -0500 |
---|---|---|
committer | Jacek Antonelli | 2008-08-15 23:45:49 -0500 |
commit | 8538c0f35dc5fb780f02930256e627e5266ede4a (patch) | |
tree | 58950646aae6534fafe680a5cf879d01cd99d254 /linden/indra/newview/llviewerwindow.cpp | |
parent | Second Life viewer sources 1.20.5 (diff) | |
download | meta-impy-8538c0f35dc5fb780f02930256e627e5266ede4a.zip meta-impy-8538c0f35dc5fb780f02930256e627e5266ede4a.tar.gz meta-impy-8538c0f35dc5fb780f02930256e627e5266ede4a.tar.bz2 meta-impy-8538c0f35dc5fb780f02930256e627e5266ede4a.tar.xz |
Second Life viewer sources 1.20.6
Diffstat (limited to '')
-rw-r--r-- | linden/indra/newview/llviewerwindow.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/linden/indra/newview/llviewerwindow.cpp b/linden/indra/newview/llviewerwindow.cpp index 563c0e6..4c76b8b 100644 --- a/linden/indra/newview/llviewerwindow.cpp +++ b/linden/indra/newview/llviewerwindow.cpp | |||
@@ -2243,7 +2243,7 @@ void LLViewerWindow::setMenuBackgroundColor(bool god_mode, bool dev_grid) | |||
2243 | 2243 | ||
2244 | void LLViewerWindow::drawDebugText() | 2244 | void LLViewerWindow::drawDebugText() |
2245 | { | 2245 | { |
2246 | gGL.start(); | 2246 | gGL.color4f(1,1,1,1); |
2247 | gGL.pushMatrix(); | 2247 | gGL.pushMatrix(); |
2248 | { | 2248 | { |
2249 | // scale view by UI global scale factor and aspect ratio correction factor | 2249 | // scale view by UI global scale factor and aspect ratio correction factor |
@@ -2251,7 +2251,7 @@ void LLViewerWindow::drawDebugText() | |||
2251 | mDebugText->draw(); | 2251 | mDebugText->draw(); |
2252 | } | 2252 | } |
2253 | gGL.popMatrix(); | 2253 | gGL.popMatrix(); |
2254 | gGL.stop(); | 2254 | gGL.flush(); |
2255 | } | 2255 | } |
2256 | 2256 | ||
2257 | void LLViewerWindow::draw() | 2257 | void LLViewerWindow::draw() |
@@ -5212,7 +5212,7 @@ void LLViewerWindow::drawPickBuffer() const | |||
5212 | { | 5212 | { |
5213 | if (mPickBuffer) | 5213 | if (mPickBuffer) |
5214 | { | 5214 | { |
5215 | gGL.start(); | 5215 | gGL.color4f(1,1,1,1); |
5216 | gGL.pushMatrix(); | 5216 | gGL.pushMatrix(); |
5217 | LLGLDisable no_blend(GL_BLEND); | 5217 | LLGLDisable no_blend(GL_BLEND); |
5218 | LLGLDisable no_alpha_test(GL_ALPHA_TEST); | 5218 | LLGLDisable no_alpha_test(GL_ALPHA_TEST); |
@@ -5248,7 +5248,7 @@ void LLViewerWindow::drawPickBuffer() const | |||
5248 | llround((F32)mPickPoint.mY * mDisplayScale.mV[VY] + (F32)(PICK_HALF_WIDTH + mPickOffset.mY) * 10.f), | 5248 | llround((F32)mPickPoint.mY * mDisplayScale.mV[VY] + (F32)(PICK_HALF_WIDTH + mPickOffset.mY) * 10.f), |
5249 | FALSE); | 5249 | FALSE); |
5250 | gGL.popMatrix(); | 5250 | gGL.popMatrix(); |
5251 | gGL.stop(); | 5251 | gGL.flush(); |
5252 | } | 5252 | } |
5253 | } | 5253 | } |
5254 | 5254 | ||