diff options
| author | dolphin <dolphin@lindenlab.com> | 2014-04-22 16:34:30 -0700 |
|---|---|---|
| committer | dolphin <dolphin@lindenlab.com> | 2014-04-22 16:34:30 -0700 |
| commit | f515e2b1ee601958ba642d638e929daf7ff6e92a (patch) | |
| tree | 2622bea403aad589701d7a176d1de59d32af6d77 /indra/newview/llinventorymodel.h | |
| parent | 90a42d43b255eca082c283e5a0dfabd4ebfce508 (diff) | |
| parent | c71e459bed68c1602d409e5c946c5e016d09d105 (diff) | |
Merge with 3.7.6-release
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 |