diff options
author | Nyx (Neal Orman) <nyx@lindenlab.com> | 2010-07-02 15:55:58 -0400 |
---|---|---|
committer | Nyx (Neal Orman) <nyx@lindenlab.com> | 2010-07-02 15:55:58 -0400 |
commit | b8daec6144bfe064eb9b43e776ec21f997de2923 (patch) | |
tree | 591ac7ea5dbbc9dda5fa71aea875f909e9603dbb /indra/newview/llwearableitemslist.cpp | |
parent | 0ad0eaa78f39790e65a2568bce096ca7d150e132 (diff) | |
parent | e78f96b2fbf7a535b7bc5fe4a0338f354cdae7ed (diff) |
Automated merge with ssh://hg.lindenlab.com/q/viewer-release/
Diffstat (limited to 'indra/newview/llwearableitemslist.cpp')
-rw-r--r-- | indra/newview/llwearableitemslist.cpp | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/indra/newview/llwearableitemslist.cpp b/indra/newview/llwearableitemslist.cpp index 868322699e..d24bd8499d 100644 --- a/indra/newview/llwearableitemslist.cpp +++ b/indra/newview/llwearableitemslist.cpp @@ -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) |