diff options
| author | Richard Linden <none@none> | 2010-08-12 12:20:47 -0700 |
|---|---|---|
| committer | Richard Linden <none@none> | 2010-08-12 12:20:47 -0700 |
| commit | 00e4fb0ac8431bda3705c218a548557cfca7e749 (patch) | |
| tree | dd006c79cad8cdf9309290272597d9d2a0e93e8b /indra/newview/llviewerattachmenu.cpp | |
| parent | 657e462b6a46bee09fe91e84ea37763db79c868c (diff) | |
| parent | bd897431e14aff091d5f45425816ddec4b2538c7 (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()) { |