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

Add RlvCommandOption support for Attachment UUID

Browse Source
This commit is contained in:
Liru Færs
2020-01-05 23:26:09 -05:00
parent 4c7eacf4fc
commit c772179149
1 changed files with 12 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
indra/newview/rlvhelper.cpp
View File

@@ -210,6 +210,10 @@ RlvCommandOptionGeneric::RlvCommandOptionGeneric(const std::string& strOption):
m_fValid = true; m_fValid = true;
} }
// ============================================================================
// RlvCommandOption structures
//
// Checked: 2012-07-28 (RLVa-1.4.7) // Checked: 2012-07-28 (RLVa-1.4.7)
class RlvCommandOptionGetPathCallback class RlvCommandOptionGetPathCallback
{ {
@@ -269,6 +273,14 @@ RlvCommandOptionGetPath::RlvCommandOptionGetPath(const RlvCommand& rlvCmd, getpa
{ {
getItemIDs(rlvCmdOption.getAttachmentPoint(), m_idItems); getItemIDs(rlvCmdOption.getAttachmentPoint(), m_idItems);
} }
else if (rlvCmdOption.isUUID()) // ... or it can specify a specific attachment
{
const LLViewerObject* pAttachObj = gObjectList.findObject(rlvCmdOption.getUUID());
if ( (pAttachObj) && (pAttachObj->isAttachment()) && (pAttachObj->permYouOwner()) )
m_idItems.push_back(pAttachObj->getAttachmentItemID());
else
m_fValid = false;
}
else if (rlvCmdOption.isEmpty()) // ... or it can be empty (in which case we act on the object that issued the command) else if (rlvCmdOption.isEmpty()) // ... or it can be empty (in which case we act on the object that issued the command)
{ {
const LLViewerObject* pObj = gObjectList.findObject(rlvCmd.getObjectID()); const LLViewerObject* pObj = gObjectList.findObject(rlvCmd.getObjectID());