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

Oh i love our Coyotl

Browse Source
This commit is contained in:
Siana Gearz
2012-09-15 07:34:06 +02:00
parent 53fd33604d
commit 3946c076fe
3 changed files with 17 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -9,6 +9,17 @@
<string>settings_rlv.xml</string>
</array>
<key>SGAllowRiggedMeshSelection</key>
<map>
<key>Comment</key>
<string>Allow selection of your worn rigged meshes in build mode</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>Boolean</string>
<key>Value</key>
<integer>0</integer>
</map>
<key>SGShiftCrouchToggle</key>
<map>
<key>Comment</key>
@@ -20,7 +31,6 @@
<key>Value</key>
<integer>1</integer>
</map>
<key>SGServerVersionChangedNotification</key>
<map>
<key>Comment</key>

4
indra/newview/llvoavatar.cpp
View File

@@ -2099,7 +2099,9 @@ LLViewerObject* LLVOAvatar::lineSegmentIntersectRiggedAttachments(const LLVector
LLVector3* normal,
LLVector3* bi_normal)
{
if (isSelf() && !gAgent.needsRenderAvatar())
static const LLCachedControl<bool> allow_mesh_picking("SGAllowRiggedMeshSelection");
if (!allow_mesh_picking || (isSelf() && !gAgent.needsRenderAvatar()))
{
return NULL;
}

5
indra/newview/llvovolume.cpp
View File

@@ -2831,10 +2831,11 @@ BOOL LLVOVolume::lineSegmentIntersect(const LLVector3& start, const LLVector3& e
if (mDrawable->isState(LLDrawable::RIGGED))
{
if (gFloaterTools->getVisible() && getAvatar()->isSelf())
static const LLCachedControl<bool> allow_mesh_picking("SGAllowRiggedMeshSelection");
if (allow_mesh_picking && gFloaterTools->getVisible() && getAvatar()->isSelf())
{
updateRiggedVolume();
genBBoxes(FALSE);
//genBBoxes(FALSE);
volume = mRiggedVolume;
transform = false;
}