diff options
author | Eric M. Tulla (BigPapi) <tulla@lindenlab.com> | 2009-12-03 12:09:16 -0500 |
---|---|---|
committer | Eric M. Tulla (BigPapi) <tulla@lindenlab.com> | 2009-12-03 12:09:16 -0500 |
commit | b05ebd89775792762063d3af08f0fe9ae785454a (patch) | |
tree | ee364573584ba2dbd2d2699707f985fbad0cbf42 /indra/newview/llviewerinventory.cpp | |
parent | 0cfc3af9aceede80230c7f2b36fb7fdcf0fcc179 (diff) | |
parent | 67f11add9c2e05e1c86e30c44c94ee1b7d9205d0 (diff) |
merge of viewer2 into avp branch
--HG--
branch : avatar-pipeline
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 1b25add20e..5bdcbc79bd 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. { |