From cc0b5e660d57f1f124295386c4eb3a2673d98bd2 Mon Sep 17 00:00:00 2001 From: Inusaito Sayori Date: Tue, 18 Mar 2014 18:38:30 -0400 Subject: [PATCH] Touch missed spots for picking rigged mesh --- indra/newview/llvovolume.cpp | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/indra/newview/llvovolume.cpp b/indra/newview/llvovolume.cpp index ea9e5605c..dbb276389 100644 --- a/indra/newview/llvovolume.cpp +++ b/indra/newview/llvovolume.cpp @@ -40,6 +40,7 @@ #include "llviewercontrol.h" #include "lldir.h" #include "llflexibleobject.h" +#include "llfloaterinspect.h" #include "llfloatertools.h" #include "llmaterialid.h" #include "llmaterialtable.h" @@ -3643,7 +3644,7 @@ BOOL LLVOVolume::lineSegmentIntersect(const LLVector4a& start, const LLVector4a& if (mDrawable->isState(LLDrawable::RIGGED)) { static const LLCachedControl allow_mesh_picking("SGAllowRiggedMeshSelection"); - if (allow_mesh_picking && gFloaterTools->getVisible() && getAvatar()->isSelf()) + if (allow_mesh_picking && (gFloaterTools->getVisible() || LLFloaterInspect::instanceExists())) { updateRiggedVolume(); //genBBoxes(FALSE); @@ -3825,10 +3826,8 @@ BOOL LLVOVolume::lineSegmentIntersect(const LLVector4a& start, const LLVector4a& bool LLVOVolume::treatAsRigged() { - return gFloaterTools->getVisible() && + return (gFloaterTools->getVisible() || LLFloaterInspect::instanceExists()) && isAttachment() && - getAvatar() && - getAvatar()->isSelf() && mDrawable.notNull() && mDrawable->isState(LLDrawable::RIGGED); }