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

Update RLVa to 1.4.0-compatible

Browse Source
This commit is contained in:
Siana Gearz
2012-01-25 21:11:33 +01:00
parent d385de9139
commit 7fec659979
31 changed files with 1637 additions and 322 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
indra/newview/llagentwearables.cpp
View File

@@ -1578,7 +1578,7 @@ void LLAgentWearables::setWearableOutfit(const LLInventoryItem::item_array_t& it
{
const LLUUID& old_item_id = getWearableItemID(type, 0);
if( (old_wearable->getAssetID() == new_wearable->getAssetID()) &&
(old_item_id == new_item->getUUID()) )
(old_item_id == new_item->getLinkedUUID()) )
{
lldebugs << "No change to wearable asset and item: " << LLWearableType::getTypeName( type ) << llendl;
continue;
@@ -1600,7 +1600,7 @@ void LLAgentWearables::setWearableOutfit(const LLInventoryItem::item_array_t& it
}
new_wearable->setName(new_item->getName());
new_wearable->setItemID(new_item->getUUID());
new_wearable->setItemID(new_item->getLinkedUUID());
if (LLWearableType::getAssetType(type) == LLAssetType::AT_BODYPART)
{
@@ -1675,9 +1675,9 @@ void LLAgentWearables::setWearableItem( LLInventoryItem* new_item, LLWearable* n
LLWearableType::EType type = new_wearable->getType();
// [RLVa:KB] - Checked: 2009-07-07 (RLVa-1.0.0d)
// [RLVa:KB] - Checked: 2009-07-07 (RLVa-1.1.4a)
// Block if: we can't wear on that layer; or we're already wearing something there we can't take off
if ( (rlv_handler_t::isEnabled()) && (!gRlvWearableLocks.canWear(type)) )
if ( (rlv_handler_t::isEnabled()) && (!gRlvWearableLocks.canWear(dynamic_cast<const LLViewerInventoryItem*>(new_item))) )
{
return;
}
@@ -1762,7 +1762,7 @@ void LLAgentWearables::setWearableFinal( LLInventoryItem* new_item, LLWearable*
{
old_item_id = old_wearable->getItemID();
}
new_wearable->setItemID(new_item->getUUID());
new_wearable->setItemID(new_item->getLinkedUUID());
setWearable(type,0,new_wearable);
if (old_item_id.notNull())