diff options
| author | Nyx (Neal Orman) <nyx@lindenlab.com> | 2010-03-30 15:42:30 -0400 |
|---|---|---|
| committer | Nyx (Neal Orman) <nyx@lindenlab.com> | 2010-03-30 15:42:30 -0400 |
| commit | 56434c554275fc4b91cd8c69f69809beb52751fe (patch) | |
| tree | f02a1cad0c6747cd3be6fa3689d582481c1fffe1 /indra/newview/llsidepanelappearance.cpp | |
| parent | bf49c0fcc472504db6e876620bedef56bc200da4 (diff) | |
| parent | 6d82b0c0a2b470452b86332f3b51d7d720bc7341 (diff) | |
Automated merge with ssh://hg.lindenlab.com/q/viewer-trunk
Diffstat (limited to 'indra/newview/llsidepanelappearance.cpp')
| -rw-r--r-- | indra/newview/llsidepanelappearance.cpp | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/indra/newview/llsidepanelappearance.cpp b/indra/newview/llsidepanelappearance.cpp index 8364eee09d..c9e9b2815c 100644 --- a/indra/newview/llsidepanelappearance.cpp +++ b/indra/newview/llsidepanelappearance.cpp @@ -358,11 +358,13 @@ void LLSidepanelAppearance::fetchInventory() LLUUID item_id; for(S32 type = (S32)WT_SHAPE; type < (S32)WT_COUNT; ++type) { - // MULTI_WEARABLE: - item_id = gAgentWearables.getWearableItemID((EWearableType)type,0); - if(item_id.notNull()) + for (U32 index = 0; index < gAgentWearables.getWearableCount((EWearableType)type); ++index) { - ids.push_back(item_id); + item_id = gAgentWearables.getWearableItemID((EWearableType)type, index); + if(item_id.notNull()) + { + ids.push_back(item_id); + } } } |