diff options
| author | Richard Linden <none@none> | 2010-08-12 09:53:17 -0700 |
|---|---|---|
| committer | Richard Linden <none@none> | 2010-08-12 09:53:17 -0700 |
| commit | 402e2a181831d30a6a2586fd4b0641ba66da99be (patch) | |
| tree | 335f57714bbc00510ede9e60c3d363722ef6ee43 /indra/newview/llviewerattachmenu.cpp | |
| parent | be50a053ed4ae7d0b15fc20f1c6ca0973c56ffd9 (diff) | |
| parent | 4e8c33e7252d38d00b5606e1960aa520c75e0227 (diff) | |
merge
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()) { |