diff options
author | Nyx (Neal Orman) <nyx@lindenlab.com> | 2010-03-30 15:20:37 -0400 |
---|---|---|
committer | Nyx (Neal Orman) <nyx@lindenlab.com> | 2010-03-30 15:20:37 -0400 |
commit | cc3f4c1f59f38a6a5caead4cbd53ddc4d94217ef (patch) | |
tree | 24538502384c162c504bd516282e13e30e3b8974 /indra/newview/llsidepanelappearance.cpp | |
parent | b15e34b94207c52d81e310f962e72f4d8030bd94 (diff) | |
parent | dbcd12a4d14412de6850fbf89dfe58b1f799222d (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); + } } } |