From 00fdc0acd5e27d353c070706e838a35bf889a536 Mon Sep 17 00:00:00 2001
From: "Brad Payne (Vir Linden)" <vir@lindenlab.com>
Date: Mon, 22 Feb 2010 14:03:29 -0500
Subject: [PATCH] Work in progress on EXT-5333: Cleanup.
---
indra/newview/llagentwearables.cpp | 2 --
indra/newview/llappearancemgr.cpp | 24 +++++++++---------------
indra/newview/llinventorybridge.cpp | 6 ++----
3 files changed, 11 insertions(+), 21 deletions(-)
diff --git a/indra/newview/llagentwearables.cpp b/indra/newview/llagentwearables.cpp
index 94fd5132ca9..08cd101b01d 100644
--- a/indra/newview/llagentwearables.cpp
+++ b/indra/newview/llagentwearables.cpp
@@ -1039,8 +1039,6 @@ void LLAgentWearables::onInitialWearableAssetArrived(LLWearable* wearable, void*
{
return;
}
-// BAP RESTORE TMP
-// if (wearable && type != WT_SHAPE) // force failure for shape to test recovery path.
if (wearable)
{
diff --git a/indra/newview/llappearancemgr.cpp b/indra/newview/llappearancemgr.cpp
index ae1a7a0cbe5..c9da08701d7 100644
--- a/indra/newview/llappearancemgr.cpp
+++ b/indra/newview/llappearancemgr.cpp
@@ -648,14 +648,14 @@ static void onWearableAssetFetch(LLWearable* wearable, void* data)
{
LLWearableHoldingPattern* holder = (LLWearableHoldingPattern*)data;
holder->mResolved += 1; // just counting callbacks, not successes.
- llinfos << "onWearableAssetFetch, resolved " << holder->mResolved << " requested " << holder->mFoundList.size() << llendl;
+ llinfos << "onWearableAssetFetch, resolved count " << holder->mResolved << " of requested " << holder->mFoundList.size() << llendl;
if (wearable)
{
- llinfos << "wearable type " << wearable->getType() << llendl;
+ llinfos << "wearable found, type " << wearable->getType() << " asset " << wearable->getAssetID() << llendl;
}
else
{
- llinfos << "wearable: NONE" << llendl;
+ llwarns << "no wearable found" << llendl;
}
if (holder->mFired)
@@ -666,18 +666,9 @@ static void onWearableAssetFetch(LLWearable* wearable, void* data)
if (!wearable)
{
- llwarns << "no wearable found" << llendl;
return;
}
-#if 0
- if ((wearable->getType() == WT_SHAPE) || (wearable->getType() == WT_JACKET))
- {
- llwarns << "Forcing failure for type " << wearable->getType() << llendl;
- return;
- }
-#endif
-
for (LLWearableHoldingPattern::found_list_t::iterator iter = holder->mFoundList.begin();
iter != holder->mFoundList.end(); ++iter)
{
@@ -1118,7 +1109,8 @@ void LLAppearanceManager::updateAppearanceFromCOF()
// callback will be called (and this object deleted)
// before the final getNextData().
- // BAP cleanup - no point having found_container when mFoundList already has all the info.
+ // BAP future cleanup - no point having found_container when
+ // mFoundList already has all the info.
LLDynamicArray<LLFoundData> found_container;
for(S32 i = 0; i < wear_items.count(); ++i)
{
@@ -1133,8 +1125,10 @@ void LLAppearanceManager::updateAppearanceFromCOF()
linked_item->isWearableType() ? linked_item->getWearableType() : WT_INVALID
);
-#if 1
- // BAP REMOVEME Force failure to test handling
+#if 0
+ // Fault injection: uncomment this block to test asset
+ // fetch failures (should be replaced by new defaults in
+ // lost&found).
if (found.mWearableType == WT_SHAPE || found.mWearableType == WT_JACKET)
{
found.mAssetID.generate(); // Replace with new UUID, guaranteed not to exist in DB
diff --git a/indra/newview/llinventorybridge.cpp b/indra/newview/llinventorybridge.cpp
index 5b59f52fa5d..d0513c35ce3 100644
--- a/indra/newview/llinventorybridge.cpp
+++ b/indra/newview/llinventorybridge.cpp
@@ -1925,7 +1925,7 @@ bool LLFindCOFValidItems::operator()(LLInventoryCategory* cat,
// - links to attachments
// - links to gestures
// - links to ensemble folders
- LLViewerInventoryItem *linked_item = ((LLViewerInventoryItem*)item)->getLinkedItem(); // BAP - safe?
+ LLViewerInventoryItem *linked_item = ((LLViewerInventoryItem*)item)->getLinkedItem();
if (linked_item)
{
LLAssetType::EType type = linked_item->getType();
@@ -1936,7 +1936,7 @@ bool LLFindCOFValidItems::operator()(LLInventoryCategory* cat,
}
else
{
- LLViewerInventoryCategory *linked_category = ((LLViewerInventoryItem*)item)->getLinkedCategory(); // BAP - safe?
+ LLViewerInventoryCategory *linked_category = ((LLViewerInventoryItem*)item)->getLinkedCategory();
// BAP remove AT_NONE support after ensembles are fully working?
return (linked_category &&
((linked_category->getPreferredType() == LLFolderType::FT_NONE) ||
@@ -2962,8 +2962,6 @@ void LLFolderBridge::modifyOutfit(BOOL append)
LLViewerInventoryCategory* cat = getCategory();
if(!cat) return;
- // BAP - was:
- // wear_inventory_category_on_avatar( cat, append );
LLAppearanceManager::instance().wearInventoryCategory( cat, FALSE, append );
}
--
GitLab