diff options
| author | Merov Linden <merov@lindenlab.com> | 2010-11-02 17:31:01 -0700 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2010-11-02 17:31:01 -0700 |
| commit | accbddaeadeec7221c9244bf1c0245b8ccbd12bc (patch) | |
| tree | 2d667f211e155cce632098c7f1667a77dd6340e7 /indra/newview | |
| parent | f481f13969c4e8ae4292ebab6e7223613db6a8bd (diff) | |
| parent | cace89d2e97a8d71179a272cbeb62630bb4a1331 (diff) | |
STORM-283 : merge with viewer-development
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/llinventorybridge.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/indra/newview/llinventorybridge.cpp b/indra/newview/llinventorybridge.cpp index 73b99b04a6..5ba87423c7 100644 --- a/indra/newview/llinventorybridge.cpp +++ b/indra/newview/llinventorybridge.cpp @@ -2908,6 +2908,7 @@ static BOOL can_move_to_outfit(LLInventoryItem* inv_item, BOOL move_is_into_curr { if ((inv_item->getInventoryType() != LLInventoryType::IT_WEARABLE) && (inv_item->getInventoryType() != LLInventoryType::IT_GESTURE) && + (inv_item->getInventoryType() != LLInventoryType::IT_ATTACHMENT) && (inv_item->getInventoryType() != LLInventoryType::IT_OBJECT)) { return FALSE; |