aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview/llviewerjointattachment.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'linden/indra/newview/llviewerjointattachment.cpp')
-rw-r--r--linden/indra/newview/llviewerjointattachment.cpp6
1 files changed, 4 insertions, 2 deletions
diff --git a/linden/indra/newview/llviewerjointattachment.cpp b/linden/indra/newview/llviewerjointattachment.cpp
index 4b58361..2517250 100644
--- a/linden/indra/newview/llviewerjointattachment.cpp
+++ b/linden/indra/newview/llviewerjointattachment.cpp
@@ -4,7 +4,7 @@
4 * 4 *
5 * $LicenseInfo:firstyear=2002&license=viewergpl$ 5 * $LicenseInfo:firstyear=2002&license=viewergpl$
6 * 6 *
7 * Copyright (c) 2002-2008, Linden Research, Inc. 7 * Copyright (c) 2002-2009, Linden Research, Inc.
8 * 8 *
9 * Second Life Viewer Source Code 9 * Second Life Viewer Source Code
10 * The source code in this file ("Source Code") is provided by Linden Lab 10 * The source code in this file ("Source Code") is provided by Linden Lab
@@ -91,7 +91,7 @@ U32 LLViewerJointAttachment::drawShape( F32 pixelArea, BOOL first_pass )
91 LLGLDisable cull_face(GL_CULL_FACE); 91 LLGLDisable cull_face(GL_CULL_FACE);
92 92
93 gGL.color4f(1.f, 1.f, 1.f, 1.f); 93 gGL.color4f(1.f, 1.f, 1.f, 1.f);
94 gGL.begin(LLVertexBuffer::QUADS); 94 gGL.begin(LLRender::QUADS);
95 { 95 {
96 gGL.vertex3f(-0.1f, 0.1f, 0.f); 96 gGL.vertex3f(-0.1f, 0.1f, 0.f);
97 gGL.vertex3f(-0.1f, -0.1f, 0.f); 97 gGL.vertex3f(-0.1f, -0.1f, 0.f);
@@ -138,6 +138,8 @@ void LLViewerJointAttachment::setupDrawable(LLDrawable* drawablep)
138 { 138 {
139 childp->mDrawable->setState(LLDrawable::USE_BACKLIGHT); 139 childp->mDrawable->setState(LLDrawable::USE_BACKLIGHT);
140 gPipeline.markTextured(childp->mDrawable); // face may need to change draw pool to/from POOL_HUD 140 gPipeline.markTextured(childp->mDrawable); // face may need to change draw pool to/from POOL_HUD
141 gPipeline.markMoved(childp->mDrawable);
142
141 if(mIsHUDAttachment) 143 if(mIsHUDAttachment)
142 { 144 {
143 for (S32 face_num = 0; face_num < childp->mDrawable->getNumFaces(); face_num++) 145 for (S32 face_num = 0; face_num < childp->mDrawable->getNumFaces(); face_num++)