diff options
author | Alexei Arabadji <aarabadji@productengine.com> | 2010-03-16 15:02:58 +0200 |
---|---|---|
committer | Alexei Arabadji <aarabadji@productengine.com> | 2010-03-16 15:02:58 +0200 |
commit | 3874823bd8a388979bad2d882d5d52bffb8d78da (patch) | |
tree | cb9713a19e8b9670cda7a5ec16b93f1e92b39584 /indra/newview/llinventorymodel.cpp | |
parent | 2fed8d5182813e2077522bb5bbb2cc565b5c283d (diff) | |
parent | a872814de964ebcbf40e812f79319a13a54e2336 (diff) |
Merge from viewer-2-0
--HG--
branch : product-engine
Diffstat (limited to 'indra/newview/llinventorymodel.cpp')
-rw-r--r-- | indra/newview/llinventorymodel.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llinventorymodel.cpp b/indra/newview/llinventorymodel.cpp index 326f2a5577..83a466a243 100644 --- a/indra/newview/llinventorymodel.cpp +++ b/indra/newview/llinventorymodel.cpp @@ -1542,7 +1542,7 @@ void LLInventoryModel::bulkFetch(std::string url) U32 folder_count=0; U32 max_batch_size=5; - U32 sort_order = gSavedSettings.getU32("InventorySortOrder") & 0x1; + U32 sort_order = gSavedSettings.getU32(LLInventoryPanel::DEFAULT_SORT_ORDER) & 0x1; LLSD body; LLSD body_lib; |