diff options
| author | Seth ProductEngine <slitovchuk@productengine.com> | 2012-02-23 21:47:03 +0200 |
|---|---|---|
| committer | Seth ProductEngine <slitovchuk@productengine.com> | 2012-02-23 21:47:03 +0200 |
| commit | 11d29660aa84a1a8a61e427698715497a57243c2 (patch) | |
| tree | 3594bf194f5859e289f85d91558a59ac5d3b8e64 /indra/newview | |
| parent | d5d2147a97953434f2baddf9d3f7c9d1be7f7b3e (diff) | |
EXP-1335 FIXED empty folders not draggable between Inventory windows.
Added filtering empty folders as any other folder view item.
This enables dragging empty folders between Inventory floaters when they pass the filter.
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/llinventorybridge.cpp | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/indra/newview/llinventorybridge.cpp b/indra/newview/llinventorybridge.cpp index dcdc1391eb..6a20120808 100644 --- a/indra/newview/llinventorybridge.cpp +++ b/indra/newview/llinventorybridge.cpp @@ -4039,11 +4039,12 @@ bool check_category(LLInventoryModel* model, S32 num_descendent_categories = descendent_categories.count(); S32 num_descendent_items = descendent_items.count(); - if (num_descendent_categories + num_descendent_items == 0 - && filter->getShowFolderState() != LLInventoryFilter::SHOW_ALL_FOLDERS) + if (num_descendent_categories + num_descendent_items == 0) { - // Empty folders are not allowed if we are not showing all folders - return false; + // Empty folder should be checked as any other folder view item. + // If we are filtering by date the folder should not pass because + // it doesn't have its own creation date. See LLInvFVBridge::getCreationDate(). + return check_item(cat_id, active_folder_view, filter); } for (S32 i = 0; i < num_descendent_categories; ++i) |