summaryrefslogtreecommitdiff
path: root/indra/newview/llinventorybridge.h
diff options
context:
space:
mode:
authorTofu Linden <tofu.linden@lindenlab.com>2010-06-02 20:17:25 +0100
committerTofu Linden <tofu.linden@lindenlab.com>2010-06-02 20:17:25 +0100
commite57ae451744f08c1c614ef6903918ba4be6d4674 (patch)
tree00608932937c6b75f9b2cdc72d151005425f95a5 /indra/newview/llinventorybridge.h
parent6b45a32ac56b95f3e70ba4948819d470f3574cea (diff)
parent142a6c3b8fa9e286c0336236d1eccd9a6725f06a (diff)
merge from PE's viewer-trunk
Diffstat (limited to 'indra/newview/llinventorybridge.h')
-rw-r--r--indra/newview/llinventorybridge.h1
1 files changed, 0 insertions, 1 deletions
diff --git a/indra/newview/llinventorybridge.h b/indra/newview/llinventorybridge.h
index c5efefac7e..59c1f3d6fb 100644
--- a/indra/newview/llinventorybridge.h
+++ b/indra/newview/llinventorybridge.h
@@ -270,7 +270,6 @@ public:
virtual BOOL copyToClipboard() const;
static void createWearable(LLFolderBridge* bridge, LLWearableType::EType type);
- static void createWearable(const LLUUID &parent_folder_id, LLWearableType::EType type);
LLViewerInventoryCategory* getCategory() const;