summaryrefslogtreecommitdiff
path: root/indra/newview/llinventorybridge.h
diff options
context:
space:
mode:
authorYuri Chebotarev <ychebotarev@productengine.com>2009-12-18 14:38:46 +0200
committerYuri Chebotarev <ychebotarev@productengine.com>2009-12-18 14:38:46 +0200
commit198587423d0eb343c6091d9af97e4ad12860166e (patch)
tree18922a60b34b16bdb4df6941850d5565b7cb1d72 /indra/newview/llinventorybridge.h
parent3bf89afebec3c535604789f0e2997598ac43bbe6 (diff)
parent2a49de3befff5e2b48a273f70a21f525b50a189c (diff)
merge
--HG-- branch : product-engine
Diffstat (limited to 'indra/newview/llinventorybridge.h')
-rw-r--r--indra/newview/llinventorybridge.h3
1 files changed, 3 insertions, 0 deletions
diff --git a/indra/newview/llinventorybridge.h b/indra/newview/llinventorybridge.h
index 117e32c6be..4d83e9b684 100644
--- a/indra/newview/llinventorybridge.h
+++ b/indra/newview/llinventorybridge.h
@@ -292,7 +292,9 @@ public:
static LLUIImagePtr getIcon(LLFolderType::EType preferred_type);
virtual BOOL renameItem(const std::string& new_name);
+
virtual BOOL removeItem();
+ BOOL removeSystemFolder();
bool removeItemResponse(const LLSD& notification, const LLSD& response);
virtual void pasteFromClipboard();
@@ -339,6 +341,7 @@ protected:
static void createNewEyes(void* user_data);
BOOL checkFolderForContentsOfType(LLInventoryModel* model, LLInventoryCollectFunctor& typeToCheck);
+ BOOL areAnyContentsWorn(LLInventoryModel* model) const;
void modifyOutfit(BOOL append);
void determineFolderType();