diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2009-12-17 16:48:53 -0800 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2009-12-17 16:48:53 -0800 |
| commit | 7105ad1def21c3e55c5c650a954b966553fe4174 (patch) | |
| tree | c9259c9a4a2b23c4cfc575529f1c92d17d5a2141 /indra/newview/llinventorybridge.h | |
| parent | e75242fd56ace32f7d65386f499ff104dde0eca6 (diff) | |
| parent | b29b9c961900f98121ba80447e1e737cff0d4331 (diff) | |
Merge.
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(); |