summaryrefslogtreecommitdiff
path: root/indra/newview/llviewerinventory.cpp
diff options
context:
space:
mode:
authorYuri Chebotarev <ychebotarev@productengine.com>2009-12-01 16:55:00 +0200
committerYuri Chebotarev <ychebotarev@productengine.com>2009-12-01 16:55:00 +0200
commit6a91f2b7f6b225f86849c9ebe53add6d2c8382a5 (patch)
treeb325606af8716c4ffe9f8d44dea13f47bcec1757 /indra/newview/llviewerinventory.cpp
parentcf3d40462e3c0421884a098505413c00f9004e6a (diff)
parentf893c39a4c92326d7ad08ee4bc79bcc611608ca9 (diff)
merge
--HG-- branch : product-engine
Diffstat (limited to 'indra/newview/llviewerinventory.cpp')
-rw-r--r--indra/newview/llviewerinventory.cpp5
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.
{