Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Extend SGAllowRiggedMeshSelection to work in inspect and on others

Browse Source
This commit is contained in:
Lirusaito
2014-03-13 01:31:11 -04:00
parent 850772a4ce
commit d98c46beb0
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
indra/newview/app_settings/settings.xml
View File

@@ -55,7 +55,7 @@
<key>SGAllowRiggedMeshSelection</key>
<map>
<key>Comment</key>
<string>Allow selection of your worn rigged meshes in build mode</string>
<string>Allow selection of worn rigged meshes in build or inspect mode</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>

3
indra/newview/llspatialpartition.cpp
View File

@@ -45,6 +45,7 @@
#include "llvolumeoctree.h"
#include "llviewercamera.h"
#include "llface.h"
#include "llfloaterinspect.h"
#include "llfloatertools.h"
#include "llviewercontrol.h"
#include "llviewerregion.h"
@@ -4372,7 +4373,7 @@ public:
if (vobj->isAvatar())
{
LLVOAvatar* avatar = (LLVOAvatar*) vobj;
if (avatar->isSelf() && gFloaterTools->getVisible())
if (gFloaterTools->getVisible() || LLFloaterInspect::instanceExists())
{
LLViewerObject* hit = avatar->lineSegmentIntersectRiggedAttachments(mStart, mEnd, -1, mPickTransparent, mFaceHit, &intersection, mTexCoord, mNormal, mTangent);
if (hit)