diff options
| author | Paul Guslisty <pguslisty@productengine.com> | 2010-06-24 15:15:14 +0300 |
|---|---|---|
| committer | Paul Guslisty <pguslisty@productengine.com> | 2010-06-24 15:15:14 +0300 |
| commit | f8f9f90965962b0e79f29a487ee5e920d6bc0f05 (patch) | |
| tree | d16877999a6279264c89d9656071a219fd7d16bd /indra | |
| parent | 370ddfb03e5df7d9207c77aec9237dfe192b65dc (diff) | |
EXT-7578 FIXED Corrupted vertical scroll bar appears on 'Edit Outfit' panel if height of 'Add More' panel was changed
- Modified LLWearableItemTypeNameComparator so that it can order BODYPART items by type
Reviewed by Mike Antipov and Neal Orman at https://codereview.productengine.com/secondlife/r/620/
--HG--
branch : product-engine
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/newview/llwearableitemslist.cpp | 4 | ||||
| -rw-r--r-- | indra/newview/llwearableitemslist.h | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/indra/newview/llwearableitemslist.cpp b/indra/newview/llwearableitemslist.cpp index da15b93697..576048ea3e 100644 --- a/indra/newview/llwearableitemslist.cpp +++ b/indra/newview/llwearableitemslist.cpp @@ -393,9 +393,9 @@ bool LLWearableItemTypeNameComparator::doCompare(const LLPanelInventoryListItemB return item_type_order1 < item_type_order2; } - if (item_type_order1 & TLO_NOT_CLOTHING) + if (item_type_order1 & TLO_SORTABLE_BY_NAME) { - // If both items are of the same asset type except AT_CLOTHING + // If both items are of the same asset type except AT_CLOTHING and AT_BODYPART // we can compare them by name. return LLWearableItemNameComparator::doCompare(wearable_item1, wearable_item2); } diff --git a/indra/newview/llwearableitemslist.h b/indra/newview/llwearableitemslist.h index eb82418454..d16a2a89c8 100644 --- a/indra/newview/llwearableitemslist.h +++ b/indra/newview/llwearableitemslist.h @@ -299,12 +299,12 @@ protected: private: enum ETypeListOrder { - TLO_ATTACHMENT = 0x01, - TLO_CLOTHING = 0x02, + TLO_CLOTHING = 0x01, + TLO_ATTACHMENT = 0x02, TLO_BODYPART = 0x04, TLO_UNKNOWN = 0x08, - TLO_NOT_CLOTHING = TLO_ATTACHMENT | TLO_BODYPART | TLO_UNKNOWN + TLO_SORTABLE_BY_NAME = TLO_ATTACHMENT | TLO_UNKNOWN }; static LLWearableItemTypeNameComparator::ETypeListOrder getTypeListOrder(LLAssetType::EType item_type); |