diff options
author | skolb <none@none> | 2009-12-03 09:18:11 -0800 |
---|---|---|
committer | skolb <none@none> | 2009-12-03 09:18:11 -0800 |
commit | 7851819c88e8049c1c3d07d279d479c53d5de777 (patch) | |
tree | e8c81e110a71427b64e0b34f4351e7acf44465f3 /indra/newview/llviewerinventory.cpp | |
parent | 9b17e6710b713fa12f6db7d6f51d97e4052a0835 (diff) | |
parent | 57b68d9bfe25fc7b9efe41a9fa30935c156acb34 (diff) |
local merge
Diffstat (limited to 'indra/newview/llviewerinventory.cpp')
-rw-r--r-- | indra/newview/llviewerinventory.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
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. { |