livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

STORM-311 FIXED "Share" button in My Inventory SP was not updated on Current Outfit changes. 

When you wear an inventory item, the code that disables/enables the button was called as soon
as the item got linked to COF, before it actually appeared on your avatar. However
to determine whether to enable the button, the code checked avatar appearence.

I fixed it to take the COF link into account, i.e. to treat items linked to COF as
worn (=not shareable), no matter has appearance been updated or not.
meow-7.2.2
Vadim ProductEngine 2010-10-20 19:24:32 +03:00
parent 04425000ae
commit 802a985882
2 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
indra/newview/llgiveinventory.cpp
View File

@ -128,7 +128,7 @@ bool LLGiveInventory::isInventoryGiveAcceptable(const LLInventoryItem* item)
switch(item->getType())
{
case LLAssetType::AT_OBJECT:
if (gAgentAvatarp->isWearingAttachment(item->getUUID()))
if (get_is_item_worn(item->getUUID()))
{
acceptable = false;
}
@ -139,7 +139,7 @@ bool LLGiveInventory::isInventoryGiveAcceptable(const LLInventoryItem* item)
BOOL copyable = false;
if (item->getPermissions().allowCopyBy(gAgentID)) copyable = true;
if (!copyable && gAgentWearables.isWearingItem(item->getUUID()))
if (!copyable && get_is_item_worn(item->getUUID()))
{
acceptable = false;
}

5
indra/newview/llinventoryfunctions.cpp
View File

@ -487,12 +487,9 @@ bool LLInventoryCollectFunctor::itemTransferCommonlyAllowed(const LLInventoryIte
return false;
break;
case LLAssetType::AT_OBJECT:
if (isAgentAvatarValid() && !gAgentAvatarp->isWearingAttachment(item->getUUID()))
return true;
break;
case LLAssetType::AT_BODYPART:
case LLAssetType::AT_CLOTHING:
if(!gAgentWearables.isWearingItem(item->getUUID()))
if (!get_is_item_worn(item->getUUID()))
return true;
break;
default: