diff options
author | Steve Bennetts <steve@lindenlab.com> | 2009-12-02 12:52:13 -0800 |
---|---|---|
committer | Steve Bennetts <steve@lindenlab.com> | 2009-12-02 12:52:13 -0800 |
commit | 7bb862c8c1aa56fea6e533d5a257b3d39b428cac (patch) | |
tree | 6a66c190788be7c2b9797e682c5c09037a95729a /indra/newview/llviewerinventory.cpp | |
parent | 6d3ca60f310e50b217a189086b652dca2e3e3854 (diff) | |
parent | d550339958c14f0d7fd222a8531df639eac49e63 (diff) |
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. { |