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/llinventorybridge.h | |
| parent | 73f1f43b8bd9ae1c3bc7f96d652c30d772da113b (diff) | |
| parent | 73952a37ed7a11331154f2f68050286722ec96da (diff) | |
Automated merge with http://10.1.4.28:8000/
Diffstat (limited to 'indra/newview/llinventorybridge.h')
| -rw-r--r-- | indra/newview/llinventorybridge.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/llinventorybridge.h b/indra/newview/llinventorybridge.h index 91055eb906..00e8b0fb08 100644 --- a/indra/newview/llinventorybridge.h +++ b/indra/newview/llinventorybridge.h @@ -594,7 +594,8 @@ public: }; void rez_attachment(LLViewerInventoryItem* item, - LLViewerJointAttachment* attachment); + LLViewerJointAttachment* attachment, + bool replace = false); // Move items from an in-world object's "Contents" folder to a specified // folder in agent inventory. |