From 32283ca3397965ed28ad23492db362355a3dbef5 Mon Sep 17 00:00:00 2001
From: Mike Antipov <mantipov@productengine.com>
Date: Thu, 24 Jun 2010 11:53:26 +0300
Subject: [PATCH] EXT-7777 FIXED reverted changes to show loading indicator for
"Wear/Attach" action.
Because it was too hard to fix EXT-7949 having so extremly lack of time.
Proper fix for EXT-7949 requires changes in different places of the code calling add/removeCOFItemLink().
Reviewed by Neal Orman at https://codereview.productengine.com/secondlife/r/644/
--HG--
branch : product-engine
---
indra/newview/llappearancemgr.cpp | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/indra/newview/llappearancemgr.cpp b/indra/newview/llappearancemgr.cpp
index 597076503de..ce022ac8407 100644
--- a/indra/newview/llappearancemgr.cpp
+++ b/indra/newview/llappearancemgr.cpp
@@ -935,7 +935,9 @@ bool LLAppearanceMgr::wearItemOnAvatar(const LLUUID& item_id_to_wear, bool do_up
// That means subscribers will be notified that loading is done after first item in a batch is worn.
// (loading indicator disappears for example before all selected items are worn)
// Have not fix this issue for 2.1 because of stability reason. EXT-7777.
- gAgentWearables.notifyLoadingStarted();
+
+ // Disabled for now because it is *not* acceptable to call updateAppearanceFromCOF() multiple times
+// gAgentWearables.notifyLoadingStarted();
LLViewerInventoryItem* item_to_wear = gInventory.getItem(item_id_to_wear);
if (!item_to_wear) return false;
@@ -2540,7 +2542,8 @@ void LLAppearanceMgr::registerAttachment(const LLUUID& item_id)
{
// we have to pass do_update = true to call LLAppearanceMgr::updateAppearanceFromCOF.
// it will trigger gAgentWariables.notifyLoadingFinished()
- LLAppearanceMgr::addCOFItemLink(item_id, true); // Add COF link for item.
+ // But it is not acceptable solution. See EXT-7777
+ LLAppearanceMgr::addCOFItemLink(item_id, false); // Add COF link for item.
}
else
{
@@ -2570,7 +2573,7 @@ void LLAppearanceMgr::linkRegisteredAttachments()
++it)
{
LLUUID item_id = *it;
- addCOFItemLink(item_id, true);
+ addCOFItemLink(item_id, false);
}
mRegisteredAttachments.clear();
}
--
GitLab