diff options
| author | Richard Linden <none@none> | 2010-08-12 10:12:52 -0700 |
|---|---|---|
| committer | Richard Linden <none@none> | 2010-08-12 10:12:52 -0700 |
| commit | 41fe9750c82605ccfbaf8f9b0f08b9068de702d3 (patch) | |
| tree | d0e6bbffa926edff4d70d87bbf030bf28cd6953a /indra/newview/llviewerattachmenu.cpp | |
| parent | 73f1f43b8bd9ae1c3bc7f96d652c30d772da113b (diff) | |
| parent | 73952a37ed7a11331154f2f68050286722ec96da (diff) | |
Automated merge with http://10.1.4.28:8000/
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 f683bd8674..5b3c4ea773 100644 --- a/indra/newview/llviewerattachmenu.cpp +++ b/indra/newview/llviewerattachmenu.cpp @@ -122,7 +122,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()) { |