diff options
| author | Eli Linden <eli@lindenlab.com> | 2010-03-04 13:49:14 -0800 |
|---|---|---|
| committer | Eli Linden <eli@lindenlab.com> | 2010-03-04 13:49:14 -0800 |
| commit | 49bdfd7fbb6ad2d0c4dc1998d13ddf26bc69ceb7 (patch) | |
| tree | 3f69e96b34e65f34cfae403f12daa351975db32a /indra/newview/llviewerinventory.cpp | |
| parent | 4c342ea57c37f99f93d25c057feb034f2a980537 (diff) | |
| parent | f8916165f95606503b37eff7177674a57fe5d73e (diff) | |
Merge
Diffstat (limited to 'indra/newview/llviewerinventory.cpp')
| -rw-r--r-- | indra/newview/llviewerinventory.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/llviewerinventory.cpp b/indra/newview/llviewerinventory.cpp index f02e854db6..80336e5c5a 100644 --- a/indra/newview/llviewerinventory.cpp +++ b/indra/newview/llviewerinventory.cpp @@ -48,6 +48,7 @@ #include "llsidetray.h" #include "llinventorybridge.h" +#include "llinventorypanel.h" #include "llfloaterinventory.h" #include "llviewerassettype.h" @@ -525,7 +526,7 @@ bool LLViewerInventoryCategory::fetchDescendents() // 2 = folders by date // Need to mask off anything but the first bit. // This comes from LLInventoryFilter from llfolderview.h - U32 sort_order = gSavedSettings.getU32("InventorySortOrder") & 0x1; + U32 sort_order = gSavedSettings.getU32(LLInventoryPanel::DEFAULT_SORT_ORDER) & 0x1; // *NOTE: For bug EXT-2879, originally commented out // gAgent.getRegion()->getCapability in order to use the old |