diff options
| author | Merov Linden <merov@lindenlab.com> | 2014-03-04 14:28:34 -0800 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2014-03-04 14:28:34 -0800 |
| commit | c7e2f81bbf299cf884d9e687fc4a7e7f7096c877 (patch) | |
| tree | 1436dbf2dfac1deecee4a2ded9a891b7bf68bfb5 /indra/newview/llinventorymodel.h | |
| parent | de8fea13627cc5978b8a6135802a52864a11c39a (diff) | |
| parent | d2b604c61181a03bb16f2b951b6f86c582860759 (diff) | |
Pull merge from viewer-maint-2287 aka Merchant Outbox
Diffstat (limited to 'indra/newview/llinventorymodel.h')
| -rwxr-xr-x | indra/newview/llinventorymodel.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/indra/newview/llinventorymodel.h b/indra/newview/llinventorymodel.h index 8aac879a93..544ca5e5dc 100755 --- a/indra/newview/llinventorymodel.h +++ b/indra/newview/llinventorymodel.h @@ -263,6 +263,11 @@ public: // Get the inventoryID or item that this item points to, else just return object_id const LLUUID& getLinkedItemID(const LLUUID& object_id) const; LLViewerInventoryItem* getLinkedItem(const LLUUID& object_id) const; + + // Copy content of all folders of type "type" into folder "id" and delete/purge the empty folders + // Note : This method has been designed for FT_OUTBOX (aka Merchant Outbox) but can be used for other categories + void consolidateForType(const LLUUID& id, LLFolderType::EType type); + private: mutable LLPointer<LLViewerInventoryItem> mLastItem; // cache recent lookups |