diff options
author | Jacek Antonelli | 2008-08-15 23:45:34 -0500 |
---|---|---|
committer | Jacek Antonelli | 2008-08-15 23:45:34 -0500 |
commit | cd17687f01420952712a500107e0f93e7ab8d5f8 (patch) | |
tree | ce48c2b706f2c1176290e39fb555fbdf6648ce01 /linden/indra/newview/lltoolselectrect.cpp | |
parent | Second Life viewer sources 1.19.0.5 (diff) | |
download | meta-impy-cd17687f01420952712a500107e0f93e7ab8d5f8.zip meta-impy-cd17687f01420952712a500107e0f93e7ab8d5f8.tar.gz meta-impy-cd17687f01420952712a500107e0f93e7ab8d5f8.tar.bz2 meta-impy-cd17687f01420952712a500107e0f93e7ab8d5f8.tar.xz |
Second Life viewer sources 1.19.1.0
Diffstat (limited to 'linden/indra/newview/lltoolselectrect.cpp')
-rw-r--r-- | linden/indra/newview/lltoolselectrect.cpp | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/linden/indra/newview/lltoolselectrect.cpp b/linden/indra/newview/lltoolselectrect.cpp index 3b74770..6adca35 100644 --- a/linden/indra/newview/lltoolselectrect.cpp +++ b/linden/indra/newview/lltoolselectrect.cpp | |||
@@ -36,6 +36,7 @@ | |||
36 | 36 | ||
37 | // Library includes | 37 | // Library includes |
38 | #include "llgl.h" | 38 | #include "llgl.h" |
39 | #include "llglimmediate.h" | ||
39 | #include "lldarray.h" | 40 | #include "lldarray.h" |
40 | 41 | ||
41 | // Viewer includes | 42 | // Viewer includes |
@@ -160,11 +161,11 @@ void LLToolSelectRect::draw() | |||
160 | { | 161 | { |
161 | if (gKeyboard->currentMask(TRUE) == MASK_CONTROL) | 162 | if (gKeyboard->currentMask(TRUE) == MASK_CONTROL) |
162 | { | 163 | { |
163 | glColor4f(1.f, 0.f, 0.f, 1.f); | 164 | gGL.color4f(1.f, 0.f, 0.f, 1.f); |
164 | } | 165 | } |
165 | else | 166 | else |
166 | { | 167 | { |
167 | glColor4f(1.f, 1.f, 0.f, 1.f); | 168 | gGL.color4f(1.f, 1.f, 0.f, 1.f); |
168 | } | 169 | } |
169 | LLGLSNoTexture gls_no_texture; | 170 | LLGLSNoTexture gls_no_texture; |
170 | gl_rect_2d( | 171 | gl_rect_2d( |
@@ -175,11 +176,11 @@ void LLToolSelectRect::draw() | |||
175 | FALSE); | 176 | FALSE); |
176 | if (gKeyboard->currentMask(TRUE) == MASK_CONTROL) | 177 | if (gKeyboard->currentMask(TRUE) == MASK_CONTROL) |
177 | { | 178 | { |
178 | glColor4f(1.f, 0.f, 0.f, 0.1f); | 179 | gGL.color4f(1.f, 0.f, 0.f, 0.1f); |
179 | } | 180 | } |
180 | else | 181 | else |
181 | { | 182 | { |
182 | glColor4f(1.f, 1.f, 0.f, 0.1f); | 183 | gGL.color4f(1.f, 1.f, 0.f, 0.1f); |
183 | } | 184 | } |
184 | gl_rect_2d( | 185 | gl_rect_2d( |
185 | llmin(mDragStartX, mDragEndX), | 186 | llmin(mDragStartX, mDragEndX), |