diff options
| author | Oz Linden <oz@lindenlab.com> | 2013-04-16 16:01:32 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2013-04-16 16:01:32 -0400 |
| commit | 327c99cadbcbe15442eaee8e0625ade17dcda61f (patch) | |
| tree | 6d89ba35638ae7e0b439150034a0333b1dc4b397 /indra/newview/llviewerattachmenu.cpp | |
| parent | e20099155378fd10f7997e36ae8ef150c8c5ad91 (diff) | |
| parent | fac6ee27f2d3277494f011271064b0e5e7e02554 (diff) | |
merge up to 3.5.2 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 db7dc3fea6..3975292ed3 100644 --- a/indra/newview/llviewerattachmenu.cpp +++ b/indra/newview/llviewerattachmenu.cpp @@ -121,7 +121,7 @@ void LLViewerAttachMenu::attachObjects(const uuid_vec_t& items, const std::strin else if(item && item->isFinished()) { // must be in library. copy it to our inventory and put it on. - LLPointer<LLInventoryCallback> cb = new RezAttachmentCallback(attachmentp); + LLPointer<LLInventoryCallback> cb = new LLBoostFuncInventoryCallback(boost::bind(rez_attachment_cb, _1, attachmentp)); copy_inventory_item(gAgent.getID(), item->getPermissions().getOwner(), item->getUUID(), |