diff options
| author | Merov Linden <merov@lindenlab.com> | 2010-08-26 21:45:20 -0700 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2010-08-26 21:45:20 -0700 |
| commit | dbe965eaa1864ff71e365608488a5015172a24ed (patch) | |
| tree | f3a7f10360a50a09ca1267fd204802507b079a17 /indra/newview/llviewerattachmenu.cpp | |
| parent | 6ed18227535e1b76ae650efdacfb14c1a884fc1a (diff) | |
| parent | 838c01e87d69a29f39554fbc5fa972ddd3baace1 (diff) | |
Sync with viewer-development
Diffstat (limited to 'indra/newview/llviewerattachmenu.cpp')
| -rw-r--r-- | indra/newview/llviewerattachmenu.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llviewerattachmenu.cpp b/indra/newview/llviewerattachmenu.cpp index 4847a3d721..db7dc3fea6 100644 --- a/indra/newview/llviewerattachmenu.cpp +++ b/indra/newview/llviewerattachmenu.cpp @@ -116,7 +116,7 @@ void LLViewerAttachMenu::attachObjects(const uuid_vec_t& items, const std::strin LLViewerInventoryItem* item = (LLViewerInventoryItem*)gInventory.getLinkedItem(id); if(item && gInventory.isObjectDescendentOf(id, gInventory.getRootFolderID())) { - rez_attachment(item, attachmentp); + rez_attachment(item, attachmentp); // don't replace if called from an "Attach To..." menu } else if(item && item->isFinished()) { |