diff options
| author | Mark Palange (Mani) <palange@lindenlab.com> | 2010-08-26 17:09:10 -0700 |
|---|---|---|
| committer | Mark Palange (Mani) <palange@lindenlab.com> | 2010-08-26 17:09:10 -0700 |
| commit | 66500c7ad5d799eb56f8f56924a00744f4a90e3d (patch) | |
| tree | fcd42e2c1853cdd897128d79b5b18eebbe32a32a /indra/newview/llviewerattachmenu.cpp | |
| parent | 225dd434cfeb6a67c5878b41538dafe2a7f4a284 (diff) | |
| parent | 1a8d917a6d0d2393a0f0248d0072dd7cfd487609 (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 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()) { |