diff options
| author | Loren Shih <seraph@lindenlab.com> | 2010-07-06 15:49:32 -0400 |
|---|---|---|
| committer | Loren Shih <seraph@lindenlab.com> | 2010-07-06 15:49:32 -0400 |
| commit | 419bfb16fdd9b79d32736fd80652685a07f9e39f (patch) | |
| tree | 4afafc0665ca3b486e2507369d9d214d40abf9ac /indra/newview/llwearableitemslist.cpp | |
| parent | ced040f8aef5a764c2e6fb261d5bbecd4df75064 (diff) | |
| parent | 7de36b3d4217f5ceee8b46a59983229b7af35981 (diff) | |
automated merge
Diffstat (limited to 'indra/newview/llwearableitemslist.cpp')
| -rw-r--r-- | indra/newview/llwearableitemslist.cpp | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/indra/newview/llwearableitemslist.cpp b/indra/newview/llwearableitemslist.cpp index 868322699e..9f9a9bef35 100644 --- a/indra/newview/llwearableitemslist.cpp +++ b/indra/newview/llwearableitemslist.cpp @@ -269,13 +269,13 @@ LLPanelAttachmentListItem* LLPanelAttachmentListItem::create(LLViewerInventoryIt void LLPanelAttachmentListItem::updateItem(const std::string& name, EItemState item_state) { - std::string title_joint; + std::string title_joint = name; LLViewerInventoryItem* inv_item = getItem(); if (inv_item && isAgentAvatarValid() && gAgentAvatarp->isWearingAttachment(inv_item->getLinkedUUID())) { std::string joint = LLTrans::getString(gAgentAvatarp->getAttachedPointName(inv_item->getLinkedUUID())); - title_joint = name + " (" + joint + ")"; + title_joint = title_joint + " (" + joint + ")"; } LLPanelInventoryListItemBase::updateItem(title_joint, item_state); @@ -783,10 +783,7 @@ void LLWearableItemsList::ContextMenu::createNewWearable(const LLUUID& item_id) // static bool LLWearableItemsList::ContextMenu::canAddWearable(const LLUUID& item_id) { - if (!gAgentWearables.areWearablesLoaded()) - { - return false; - } + // TODO: investigate wearables may not be loaded at this point EXT-8231 LLViewerInventoryItem* item = gInventory.getItem(item_id); if (!item || item->getType() != LLAssetType::AT_CLOTHING) |