summaryrefslogtreecommitdiff
path: root/indra/newview/llinventorybridge.h
diff options
context:
space:
mode:
authorNyx (Neal Orman) <nyx@lindenlab.com>2010-06-04 11:10:15 -0400
committerNyx (Neal Orman) <nyx@lindenlab.com>2010-06-04 11:10:15 -0400
commitc26eeb6f7a51759bc4597ab7ae6efc80ee50b1c3 (patch)
treebd816169f34950b119db5979efe0d8e68ce98277 /indra/newview/llinventorybridge.h
parenta77d273e3ab448d84507bfdb763df8335eadea9e (diff)
parent47beb6dc9c4f7c1557536f8116cc98b8bbc24629 (diff)
Automated merge with ssh://hg.lindenlab.com/dessie/viewer-public
Diffstat (limited to 'indra/newview/llinventorybridge.h')
-rw-r--r--indra/newview/llinventorybridge.h2
1 files changed, 0 insertions, 2 deletions
diff --git a/indra/newview/llinventorybridge.h b/indra/newview/llinventorybridge.h
index 310fd7fb1d..a342a2da14 100644
--- a/indra/newview/llinventorybridge.h
+++ b/indra/newview/llinventorybridge.h
@@ -591,8 +591,6 @@ public:
U32 flags = 0x00) const;
};
-void wear_inventory_item_on_avatar(LLInventoryItem* item);
-
void rez_attachment(LLViewerInventoryItem* item,
LLViewerJointAttachment* attachment);