diff options
author | Sergei Litovchuk <slitovchuk@productengine.com> | 2009-12-01 20:29:26 +0200 |
---|---|---|
committer | Sergei Litovchuk <slitovchuk@productengine.com> | 2009-12-01 20:29:26 +0200 |
commit | 57fca8d6e8c3c925fc3a3fff8833c4e43db8f24c (patch) | |
tree | b5ac1efe546cedbf337d98a3d2ffbbb5b23e36d1 /indra/newview/llviewerinventory.cpp | |
parent | 56504054d8e0cba815c25035ed7dd71015cf3222 (diff) | |
parent | 3385ce87f14f71d739a3834fbf3436a962fbdd9d (diff) |
merge
--HG--
branch : product-engine
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. { |