diff options
| author | Brad Kittenbrink <brad@lindenlab.com> | 2008-02-27 18:58:14 +0000 |
|---|---|---|
| committer | Brad Kittenbrink <brad@lindenlab.com> | 2008-02-27 18:58:14 +0000 |
| commit | 6d52efe452aa8469e0343da1c7d108f3f52ab651 (patch) | |
| tree | a87be48e9840d7fc1f7ee514d7c7f994e71fdb3c /indra/newview/lltoolselectrect.cpp | |
| parent | 6027ad2630b8650cabcf00628ee9b0d25bedd67f (diff) | |
Merge of windlight into release (QAR-286). This includes all changes in
windlight14 which have passed QA (up through r79932).
svn merge -r 80831:80833 svn+ssh://svn.lindenlab.com/svn/linden/branches/merge_windlight14_r80620
Diffstat (limited to 'indra/newview/lltoolselectrect.cpp')
| -rw-r--r-- | indra/newview/lltoolselectrect.cpp | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/indra/newview/lltoolselectrect.cpp b/indra/newview/lltoolselectrect.cpp index dd1a01f8dd..3b68751740 100644 --- a/indra/newview/lltoolselectrect.cpp +++ b/indra/newview/lltoolselectrect.cpp @@ -36,6 +36,7 @@ // Library includes #include "llgl.h" +#include "llglimmediate.h" #include "lldarray.h" // Viewer includes @@ -160,11 +161,11 @@ void LLToolSelectRect::draw() { if (gKeyboard->currentMask(TRUE) == MASK_CONTROL) { - glColor4f(1.f, 0.f, 0.f, 1.f); + gGL.color4f(1.f, 0.f, 0.f, 1.f); } else { - glColor4f(1.f, 1.f, 0.f, 1.f); + gGL.color4f(1.f, 1.f, 0.f, 1.f); } LLGLSNoTexture gls_no_texture; gl_rect_2d( @@ -175,11 +176,11 @@ void LLToolSelectRect::draw() FALSE); if (gKeyboard->currentMask(TRUE) == MASK_CONTROL) { - glColor4f(1.f, 0.f, 0.f, 0.1f); + gGL.color4f(1.f, 0.f, 0.f, 0.1f); } else { - glColor4f(1.f, 1.f, 0.f, 0.1f); + gGL.color4f(1.f, 1.f, 0.f, 0.1f); } gl_rect_2d( llmin(mDragStartX, mDragEndX), |