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

Merge in select parts of https://bitbucket.org/Kitty_Barnett/rlva-development @ 1adfc2cd210c4cf3a8800b31915d363bfe47d045

Browse Source
This commit is contained in:
Shyotl
2015-06-26 20:59:31 -05:00
parent 4d61305095
commit a380161283
27 changed files with 714 additions and 334 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
indra/newview/rlvcommon.cpp
View File

@@ -692,10 +692,30 @@ bool rlvPredCanNotWearItem(const LLViewerInventoryItem* pItem, ERlvWearMask eWea
return !rlvPredCanWearItem(pItem, eWearMask);
}
// Checked: 2010-03-22 (RLVa-1.2.0c) | Added: RLVa-1.2.0a
// Checked: 2014-11-02 (RLVa-1.4.11)
bool rlvPredCanRemoveItem(const LLUUID& idItem)
{
// Check the inventory item if it's available
const LLViewerInventoryItem* pItem = gInventory.getItem(idItem);
if (pItem)
{
return rlvPredCanRemoveItem(pItem);
}
// Temporary attachments don't have inventory items associated with them so check the attachment itself
if (isAgentAvatarValid())
{
const LLViewerObject* pAttachObj = gAgentAvatarp->getWornAttachment(idItem);
return (pAttachObj) && (!gRlvAttachmentLocks.isLockedAttachment(pAttachObj));
}
return false;
}
// Checked: 2010-03-22 (RLVa-1.2.0)
bool rlvPredCanRemoveItem(const LLViewerInventoryItem* pItem)
{
if ( (pItem) && (RlvForceWear::isWearableItem(pItem)) )
if (pItem)
{
switch (pItem->getType())
{
@@ -707,12 +727,10 @@ bool rlvPredCanRemoveItem(const LLViewerInventoryItem* pItem)
case LLAssetType::AT_GESTURE:
return true;
default:
RLV_ASSERT(false);
RLV_ASSERT(!RlvForceWear::isWearableItem(pItem));
}
}
// HACK-RLVa: Until LL supports temporary attachment detection assume that no inventory item means a temporary
// attachment which are always removeable
return true;
return false;
}
// Checked: 2010-03-22 (RLVa-1.2.0c) | Added: RLVa-1.2.0a