From 802a985882532dd3bfa5497155f0097d201e4d46 Mon Sep 17 00:00:00 2001 From: Vadim ProductEngine Date: Wed, 20 Oct 2010 19:24:32 +0300 Subject: 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. --- indra/newview/llinventoryfunctions.cpp | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'indra/newview/llinventoryfunctions.cpp') diff --git a/indra/newview/llinventoryfunctions.cpp b/indra/newview/llinventoryfunctions.cpp index f3d9639dee..ef20869114 100644 --- a/indra/newview/llinventoryfunctions.cpp +++ b/indra/newview/llinventoryfunctions.cpp @@ -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: -- cgit v1.2.3 From 05c14aa5588596a3bef49cee45e648c1f5ef18b7 Mon Sep 17 00:00:00 2001 From: Vadim ProductEngine Date: Tue, 4 Jan 2011 13:52:29 +0200 Subject: STORM-702 FIXED Made it possible to wear partial outfits Enabled the "Replace Current Outfit" option for incomplete outfits (i.e. those that don't contain full set of body parts). --- indra/newview/llinventoryfunctions.cpp | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'indra/newview/llinventoryfunctions.cpp') diff --git a/indra/newview/llinventoryfunctions.cpp b/indra/newview/llinventoryfunctions.cpp index ef20869114..61d0a150b7 100644 --- a/indra/newview/llinventoryfunctions.cpp +++ b/indra/newview/llinventoryfunctions.cpp @@ -686,6 +686,12 @@ bool LLFindWearablesEx::operator()(LLInventoryCategory* cat, LLInventoryItem* it return false; } + // Skip broken links. + if (vitem->getIsBrokenLink()) + { + return false; + } + return (bool) get_is_item_worn(item->getUUID()) == mIsWorn; } -- cgit v1.2.3