aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview/llviewerjointmesh.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'linden/indra/newview/llviewerjointmesh.cpp')
-rw-r--r--linden/indra/newview/llviewerjointmesh.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/linden/indra/newview/llviewerjointmesh.cpp b/linden/indra/newview/llviewerjointmesh.cpp
index 9ffeee4..b590907 100644
--- a/linden/indra/newview/llviewerjointmesh.cpp
+++ b/linden/indra/newview/llviewerjointmesh.cpp
@@ -56,7 +56,7 @@
56#include "llvoavatar.h" 56#include "llvoavatar.h"
57#include "llsky.h" 57#include "llsky.h"
58#include "pipeline.h" 58#include "pipeline.h"
59#include "llglslshader.h" 59#include "llviewershadermgr.h"
60#include "llmath.h" 60#include "llmath.h"
61#include "v4math.h" 61#include "v4math.h"
62#include "m3math.h" 62#include "m3math.h"
@@ -307,7 +307,7 @@ void LLViewerJointMesh::setMesh( LLPolyMesh *mesh )
307 U32 jn; 307 U32 jn;
308 for (jn = 0; jn < numJointNames; jn++) 308 for (jn = 0; jn < numJointNames; jn++)
309 { 309 {
310 //llinfos << "Setting up joint " << jointNames[jn].c_str() << llendl; 310 //llinfos << "Setting up joint " << jointNames[jn] << llendl;
311 LLViewerJoint* joint = (LLViewerJoint*)(getRoot()->findJoint(jointNames[jn]) ); 311 LLViewerJoint* joint = (LLViewerJoint*)(getRoot()->findJoint(jointNames[jn]) );
312 mSkinJoints[jn].setupSkinJoint( joint ); 312 mSkinJoints[jn].setupSkinJoint( joint );
313 } 313 }
@@ -880,7 +880,7 @@ void LLViewerJointMesh::updateJointGeometry()
880 && mFace 880 && mFace
881 && mMesh->hasWeights() 881 && mMesh->hasWeights()
882 && mFace->mVertexBuffer.notNull() 882 && mFace->mVertexBuffer.notNull()
883 && LLShaderMgr::getVertexShaderLevel(LLShaderMgr::SHADER_AVATAR) == 0)) 883 && LLViewerShaderMgr::instance()->getVertexShaderLevel(LLViewerShaderMgr::SHADER_AVATAR) == 0))
884 { 884 {
885 return; 885 return;
886 } 886 }