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/lljoystickbutton.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/lljoystickbutton.cpp')
| -rw-r--r-- | indra/newview/lljoystickbutton.cpp | 23 |
1 files changed, 12 insertions, 11 deletions
diff --git a/indra/newview/lljoystickbutton.cpp b/indra/newview/lljoystickbutton.cpp index 9e0fa26f25..0027036b36 100644 --- a/indra/newview/lljoystickbutton.cpp +++ b/indra/newview/lljoystickbutton.cpp @@ -36,6 +36,7 @@ // Library includes #include "llcoord.h" #include "indra_constants.h" +#include "llglimmediate.h" // Project includes #include "llui.h" @@ -652,23 +653,23 @@ void LLJoystickCameraRotate::drawRotatedImage( const LLImageGL* image, S32 rotat image->bind(); - glColor4fv(UI_VERTEX_COLOR.mV); + gGL.color4fv(UI_VERTEX_COLOR.mV); - glBegin(GL_QUADS); + gGL.begin(GL_QUADS); { - glTexCoord2fv( uv[ (rotations + 0) % 4]); - glVertex2i(width, height ); + gGL.texCoord2fv( uv[ (rotations + 0) % 4]); + gGL.vertex2i(width, height ); - glTexCoord2fv( uv[ (rotations + 1) % 4]); - glVertex2i(0, height ); + gGL.texCoord2fv( uv[ (rotations + 1) % 4]); + gGL.vertex2i(0, height ); - glTexCoord2fv( uv[ (rotations + 2) % 4]); - glVertex2i(0, 0); + gGL.texCoord2fv( uv[ (rotations + 2) % 4]); + gGL.vertex2i(0, 0); - glTexCoord2fv( uv[ (rotations + 3) % 4]); - glVertex2i(width, 0); + gGL.texCoord2fv( uv[ (rotations + 3) % 4]); + gGL.vertex2i(width, 0); } - glEnd(); + gGL.end(); } |