diff options
| author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2017-10-25 19:01:47 +0100 |
|---|---|---|
| committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2017-10-25 19:01:47 +0100 |
| commit | 6b6807598fa265750571e8ec9fa1b87b949be1fe (patch) | |
| tree | 8443a2d024bb89c5eda0253670372609593bdede /indra/newview | |
| parent | 67710e51001e55aaa9aed0dc40d1db4192ed958d (diff) | |
SL-785 - get non-mesh objects in animesh linksets to display
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/llvovolume.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/indra/newview/llvovolume.cpp b/indra/newview/llvovolume.cpp index 508d99ca1f..c020cb43d2 100644 --- a/indra/newview/llvovolume.cpp +++ b/indra/newview/llvovolume.cpp @@ -5081,9 +5081,9 @@ void LLVolumeGeometryManager::rebuildGeom(LLSpatialGroup* group) drawablep->clearState(LLDrawable::HAS_ALPHA); - bool rigged = vobj->isAttachment() && - vobj->isMesh() && - gMeshRepo.getSkinInfo(vobj->getVolume()->getParams().getSculptID(), vobj); + bool rigged = vobj->isMesh() && + vobj->isAttachment() && + gMeshRepo.getSkinInfo(vobj->getVolume()->getParams().getSculptID(), vobj); if (vobj->isAnimatedObject()) { @@ -5115,9 +5115,9 @@ void LLVolumeGeometryManager::rebuildGeom(LLSpatialGroup* group) // there are no LLFaces associated with the drawable. bool is_rigged = false; - // AXON handle NPC case - if (rigged && rigged_av && !vobj->isAnimatedObject()) + if (rigged && rigged_av) { + // AXON don't we want to do this for standalone animesh as well? rigged_av->addAttachmentOverridesForObject(vobj); if (!LLApp::isExiting() && rigged_av->isSelf() && debugLoggingEnabled("AvatarAttachments")) { @@ -5142,7 +5142,7 @@ void LLVolumeGeometryManager::rebuildGeom(LLSpatialGroup* group) //sum up face verts and indices drawablep->updateFaceSize(i); - if (rigged || (vobj->getControlAvatar() && vobj->getControlAvatar()->mPlaying)) + if (rigged || (vobj->getControlAvatar() && vobj->getControlAvatar()->mPlaying && vobj->isMesh())) { if (!facep->isState(LLFace::RIGGED)) { //completely reset vertex buffer |