diff options
| author | James Cook <james@lindenlab.com> | 2009-12-18 10:50:29 -0800 |
|---|---|---|
| committer | James Cook <james@lindenlab.com> | 2009-12-18 10:50:29 -0800 |
| commit | eb501f3231aacb2fd97d8428bb2d25b818b26263 (patch) | |
| tree | 85a58ed7942c2b96b3e03c9e4dbd8237423e7696 /indra/newview/llinventorybridge.h | |
| parent | b0fd284fbf72ef3a38ea64a61f8d5fe3e2e314b7 (diff) | |
| parent | ad6d0e3bb766c737b1e9bbd9d006391cc8bcc085 (diff) | |
Merge, pulling in viewer-2-0
Diffstat (limited to 'indra/newview/llinventorybridge.h')
| -rw-r--r-- | indra/newview/llinventorybridge.h | 3 |
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(); |