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/llui/llview.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/llui/llview.cpp')
| -rw-r--r-- | indra/llui/llview.cpp | 25 |
1 files changed, 13 insertions, 12 deletions
diff --git a/indra/llui/llview.cpp b/indra/llui/llview.cpp index 56e24085ac..0a37c03ac5 100644 --- a/indra/llui/llview.cpp +++ b/indra/llui/llview.cpp @@ -37,6 +37,7 @@ #include <cassert> #include <boost/tokenizer.hpp> +#include "llglimmediate.h" #include "llevent.h" #include "llfontgl.h" #include "llfocusmgr.h" @@ -1290,28 +1291,28 @@ void LLView::drawDebugRect() border_color.mV[sDepth%3] = 1.f; } - glColor4fv( border_color.mV ); + gGL.color4fv( border_color.mV ); - glBegin(GL_LINES); - glVertex2i(0, debug_rect.getHeight() - 1); - glVertex2i(0, 0); + gGL.begin(GL_LINES); + gGL.vertex2i(0, debug_rect.getHeight() - 1); + gGL.vertex2i(0, 0); - glVertex2i(0, 0); - glVertex2i(debug_rect.getWidth() - 1, 0); + gGL.vertex2i(0, 0); + gGL.vertex2i(debug_rect.getWidth() - 1, 0); - glVertex2i(debug_rect.getWidth() - 1, 0); - glVertex2i(debug_rect.getWidth() - 1, debug_rect.getHeight() - 1); + gGL.vertex2i(debug_rect.getWidth() - 1, 0); + gGL.vertex2i(debug_rect.getWidth() - 1, debug_rect.getHeight() - 1); - glVertex2i(debug_rect.getWidth() - 1, debug_rect.getHeight() - 1); - glVertex2i(0, debug_rect.getHeight() - 1); - glEnd(); + gGL.vertex2i(debug_rect.getWidth() - 1, debug_rect.getHeight() - 1); + gGL.vertex2i(0, debug_rect.getHeight() - 1); + gGL.end(); // Draw the name if it's not a leaf node if (mChildList.size() && !sEditingUI) { //char temp[256]; S32 x, y; - glColor4fv( border_color.mV ); + gGL.color4fv( border_color.mV ); x = debug_rect.getWidth()/2; y = debug_rect.getHeight()/2; LLString debug_text = llformat("%s (%d x %d)", getName().c_str(), |