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/llhudeffectlookat.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/llhudeffectlookat.cpp')
| -rw-r--r-- | indra/newview/llhudeffectlookat.cpp | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/indra/newview/llhudeffectlookat.cpp b/indra/newview/llhudeffectlookat.cpp index 16c77149d5..920a1caaf3 100644 --- a/indra/newview/llhudeffectlookat.cpp +++ b/indra/newview/llhudeffectlookat.cpp @@ -33,6 +33,8 @@ #include "llhudeffectlookat.h" +#include "llglimmediate.h" + #include "message.h" #include "llagent.h" #include "llvoavatar.h" @@ -498,19 +500,19 @@ void LLHUDEffectLookAt::render() glPushMatrix(); glTranslatef(target.mV[VX], target.mV[VY], target.mV[VZ]); glScalef(0.3f, 0.3f, 0.3f); - glBegin(GL_LINES); + gGL.begin(GL_LINES); { LLColor3 color = (*mAttentions)[mTargetType].mColor; - glColor3f(color.mV[VRED], color.mV[VGREEN], color.mV[VBLUE]); - glVertex3f(-1.f, 0.f, 0.f); - glVertex3f(1.f, 0.f, 0.f); + gGL.color3f(color.mV[VRED], color.mV[VGREEN], color.mV[VBLUE]); + gGL.vertex3f(-1.f, 0.f, 0.f); + gGL.vertex3f(1.f, 0.f, 0.f); - glVertex3f(0.f, -1.f, 0.f); - glVertex3f(0.f, 1.f, 0.f); + gGL.vertex3f(0.f, -1.f, 0.f); + gGL.vertex3f(0.f, 1.f, 0.f); - glVertex3f(0.f, 0.f, -1.f); - glVertex3f(0.f, 0.f, 1.f); - } glEnd(); + gGL.vertex3f(0.f, 0.f, -1.f); + gGL.vertex3f(0.f, 0.f, 1.f); + } gGL.end(); glPopMatrix(); } } |