summaryrefslogtreecommitdiff
path: root/indra/newview/llappearancemgr.cpp
diff options
context:
space:
mode:
authorDessie Linden <dessie@lindenlab.com>2010-06-01 04:47:53 -0700
committerDessie Linden <dessie@lindenlab.com>2010-06-01 04:47:53 -0700
commit20a69c3771937c55a9a25417e8ef1166081a525b (patch)
treefbc5f565464d098815a60d9aea28d92f986e4ffa /indra/newview/llappearancemgr.cpp
parent66186ea81fd192e1ec88e0ea879af44726c0ea57 (diff)
parent4cc5c7d2a4511ffc65bf3b6b0b2e29beb5b0fed4 (diff)
Merged from viewer-public
Diffstat (limited to 'indra/newview/llappearancemgr.cpp')
-rw-r--r--indra/newview/llappearancemgr.cpp10
1 files changed, 8 insertions, 2 deletions
diff --git a/indra/newview/llappearancemgr.cpp b/indra/newview/llappearancemgr.cpp
index c417f8bdf5..f27e632180 100644
--- a/indra/newview/llappearancemgr.cpp
+++ b/indra/newview/llappearancemgr.cpp
@@ -1790,10 +1790,16 @@ struct WearablesOrderComparator
U32 mControlSize;
};
-void LLAppearanceMgr::updateClothingOrderingInfo()
+void LLAppearanceMgr::updateClothingOrderingInfo(LLUUID cat_id)
{
+ if (cat_id.isNull())
+ {
+ cat_id = getCOF();
+ }
+
+ // COF is processed if cat_id is not specified
LLInventoryModel::item_array_t wear_items;
- getDescendentsOfAssetType(getCOF(), wear_items, LLAssetType::AT_CLOTHING, false);
+ getDescendentsOfAssetType(cat_id, wear_items, LLAssetType::AT_CLOTHING, false);
wearables_by_type_t items_by_type(LLWearableType::WT_COUNT);
divvyWearablesByType(wear_items, items_by_type);