aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview/llvoavatar.cpp
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--linden/indra/newview/llvoavatar.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/linden/indra/newview/llvoavatar.cpp b/linden/indra/newview/llvoavatar.cpp
index 7989704..7de2f9c 100644
--- a/linden/indra/newview/llvoavatar.cpp
+++ b/linden/indra/newview/llvoavatar.cpp
@@ -3965,7 +3965,7 @@ U32 LLVOAvatar::renderSkinned(EAvatarRenderPass pass)
3965 LLVector3 collide_point = slaved_pos; 3965 LLVector3 collide_point = slaved_pos;
3966 collide_point.mV[VZ] -= foot_plane_normal.mV[VZ] * (dist_from_plane + COLLISION_TOLERANCE - FOOT_COLLIDE_FUDGE); 3966 collide_point.mV[VZ] -= foot_plane_normal.mV[VZ] * (dist_from_plane + COLLISION_TOLERANCE - FOOT_COLLIDE_FUDGE);
3967 3967
3968 gGL.begin(GL_LINES); 3968 gGL.begin(LLVertexBuffer::LINES);
3969 { 3969 {
3970 F32 SQUARE_SIZE = 0.2f; 3970 F32 SQUARE_SIZE = 0.2f;
3971 gGL.color4f(1.f, 0.f, 0.f, 1.f); 3971 gGL.color4f(1.f, 0.f, 0.f, 1.f);
@@ -4138,10 +4138,10 @@ U32 LLVOAvatar::renderImpostor(LLColor4U color)
4138 LLGLEnable test(GL_ALPHA_TEST); 4138 LLGLEnable test(GL_ALPHA_TEST);
4139 glAlphaFunc(GL_GREATER, 0.f); 4139 glAlphaFunc(GL_GREATER, 0.f);
4140 4140
4141 gGL.start(); 4141 gGL.color4f(1,1,1,1);
4142 gGL.color4ubv(color.mV); 4142 gGL.color4ubv(color.mV);
4143 mImpostor.bindTexture(); 4143 mImpostor.bindTexture();
4144 gGL.begin(GL_QUADS); 4144 gGL.begin(LLVertexBuffer::QUADS);
4145 gGL.texCoord2f(0,0); 4145 gGL.texCoord2f(0,0);
4146 gGL.vertex3fv((pos+left-up).mV); 4146 gGL.vertex3fv((pos+left-up).mV);
4147 gGL.texCoord2f(1,0); 4147 gGL.texCoord2f(1,0);
@@ -4151,7 +4151,7 @@ U32 LLVOAvatar::renderImpostor(LLColor4U color)
4151 gGL.texCoord2f(0,1); 4151 gGL.texCoord2f(0,1);
4152 gGL.vertex3fv((pos+left+up).mV); 4152 gGL.vertex3fv((pos+left+up).mV);
4153 gGL.end(); 4153 gGL.end();
4154 gGL.stop(); 4154 gGL.flush();
4155 4155
4156 return 6; 4156 return 6;
4157} 4157}