From 176f29106de904433d62530b00df05a23c21eb8c Mon Sep 17 00:00:00 2001 From: Dmitry Zaporozhan Date: Tue, 1 Dec 2009 16:16:21 +0200 Subject: Workaround for major bug EXT-2879 - Only 'Online' accordion is present in the People panel / Friends tab. --HG-- branch : product-engine --- indra/newview/llviewerinventory.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'indra/newview/llviewerinventory.cpp') diff --git a/indra/newview/llviewerinventory.cpp b/indra/newview/llviewerinventory.cpp index d0ae5d1e38..f9e1a94def 100644 --- a/indra/newview/llviewerinventory.cpp +++ b/indra/newview/llviewerinventory.cpp @@ -509,7 +509,10 @@ bool LLViewerInventoryCategory::fetchDescendents() // This comes from LLInventoryFilter from llfolderview.h U32 sort_order = gSavedSettings.getU32("InventorySortOrder") & 0x1; - std::string url = gAgent.getRegion()->getCapability("WebFetchInventoryDescendents"); + // *NOTE + // Temporary workaround for bug EXT-2879, see ticket for details. + // Commented gAgent.getRegion()->getCapability in order to use the old system. + std::string url;//= gAgent.getRegion()->getCapability("WebFetchInventoryDescendents"); if (!url.empty()) //Capability found. Build up LLSD and use it. { -- cgit v1.2.3 From 4916305ce1ea60c969c12d8dc8e573f3ee933c3f Mon Sep 17 00:00:00 2001 From: Loren Shih Date: Tue, 1 Dec 2009 18:57:15 -0500 Subject: EXT-3029 : Missing icons for broken item link / broken folder link EXT-3024 : Broken links don't show up in inventory Mocked up some link icons for broken links. These need to be polished up. Broken links now have an IT_ (instead of being IT_NONE) so that they're filtered correctly and thus can show up in inventory. --HG-- branch : avatar-pipeline --- indra/newview/llviewerinventory.cpp | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) (limited to 'indra/newview/llviewerinventory.cpp') diff --git a/indra/newview/llviewerinventory.cpp b/indra/newview/llviewerinventory.cpp index d0ae5d1e38..1b25add20e 100644 --- a/indra/newview/llviewerinventory.cpp +++ b/indra/newview/llviewerinventory.cpp @@ -909,8 +909,20 @@ void link_inventory_item( } LLUUID transaction_id; - std::string desc = "Link"; + std::string desc = "Broken link"; // This should only show if the object can't find its baseobj. LLInventoryType::EType inv_type = LLInventoryType::IT_NONE; + if (dynamic_cast(baseobj)) + { + inv_type = LLInventoryType::IT_CATEGORY; + } + else + { + const LLViewerInventoryItem *baseitem = dynamic_cast(baseobj); + if (baseitem) + { + inv_type = baseitem->getInventoryType(); + } + } LLMessageSystem* msg = gMessageSystem; msg->newMessageFast(_PREHASH_LinkInventoryItem); -- cgit v1.2.3