diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-03-05 11:16:34 +0000 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-03-05 11:16:34 +0000 |
| commit | b27ce5bc88af7195f18b1d8752056d80620be702 (patch) | |
| tree | 92f76557b6be33c3b32c2011393df1875f225eeb /indra/newview/llviewerinventory.cpp | |
| parent | ac2dc19029d0b17292beadc834fdf41330eb88d8 (diff) | |
| parent | a5c202dcfd1eb8240e1f03d3a9d42a360b41bab2 (diff) | |
merge from viewer-2-0
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 |