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

[RLVa] Add remattach:<uuid>

Browse Source 
Thanks for the assistance Caeil!
This commit is contained in:
Lirusaito
2019-03-06 15:56:01 -05:00
parent f8b355c9d8
commit 2d222c721b
1 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
indra/newview/rlvhandler.cpp
View File

@@ -1791,18 +1791,24 @@ ERlvCmdRet RlvHandler::onForceRemAttach(const RlvCommand& rlvCmd) const
// @remattach=force - force detach all attachments points
else if ( (rlvCmdOption.isAttachmentPointGroup()) || (rlvCmdOption.isEmpty()) )
{
for (LLVOAvatar::attachment_map_t::const_iterator itAttach = gAgentAvatarp->mAttachmentPoints.begin();
itAttach != gAgentAvatarp->mAttachmentPoints.end(); ++itAttach)
for (const auto& entryAttachPt : gAgentAvatarp->mAttachmentPoints)
{
const LLViewerJointAttachment* pAttachPt = itAttach->second;
if ( (pAttachPt) && (pAttachPt->getNumObjects()) &&
((rlvCmdOption.isEmpty()) || (rlvAttachGroupFromIndex(pAttachPt->getGroup()) == rlvCmdOption.getAttachmentPointGroup())) )
const LLViewerJointAttachment* pAttachPt = entryAttachPt.second;
if ( (pAttachPt) && (pAttachPt->getNumObjects()) && ((rlvCmdOption.isEmpty()) || (rlvAttachGroupFromIndex(pAttachPt->getGroup()) == rlvCmdOption.getAttachmentPointGroup())) )
{
RlvForceWear::instance().forceDetach(pAttachPt);
}
}
return RLV_RET_SUCCESS;
}
// @remattach:<uuid>=force - force detach a specific attachment
else if (rlvCmdOption.isUUID())
{
const LLViewerObject* pAttachObj = gObjectList.findObject(rlvCmdOption.getUUID());
if ( (pAttachObj) && (pAttachObj->isAttachment()) && (pAttachObj->permYouOwner()) )
RlvForceWear::instance().forceDetach(pAttachObj);
return RLV_RET_SUCCESS;
}
return RLV_RET_FAILED_OPTION;
}