diff options
author | Nyx (Neal Orman) <nyx@lindenlab.com> | 2010-06-03 20:06:34 -0400 |
---|---|---|
committer | Nyx (Neal Orman) <nyx@lindenlab.com> | 2010-06-03 20:06:34 -0400 |
commit | 6286b1cbd495ec589286ee89699a93ce9c1bed77 (patch) | |
tree | b4b992a519a502c1b2bb66e34b7bae80ca4978db /indra/newview/llinventorybridge.h | |
parent | a9164676687341fae33d3fe5f22b05156a65ff85 (diff) | |
parent | 2caa710a46d3baa1e6a884961f1ff756d35ef5df (diff) |
Automated merge with ssh://hg.lindenlab.com/dessie/viewer-public
Diffstat (limited to 'indra/newview/llinventorybridge.h')
-rw-r--r-- | indra/newview/llinventorybridge.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/indra/newview/llinventorybridge.h b/indra/newview/llinventorybridge.h index 59c1f3d6fb..dcf0487250 100644 --- a/indra/newview/llinventorybridge.h +++ b/indra/newview/llinventorybridge.h @@ -592,8 +592,6 @@ public: U32 flags = 0x00) const; }; -void wear_inventory_item_on_avatar(LLInventoryItem* item); - void rez_attachment(LLViewerInventoryItem* item, LLViewerJointAttachment* attachment); |