diff options
author | Simon Linden <simon@lindenlab.com> | 2014-07-18 22:39:50 +0000 |
---|---|---|
committer | Simon Linden <simon@lindenlab.com> | 2014-07-18 22:39:50 +0000 |
commit | 7021288859036789dc268233cc1a3401d6082721 (patch) | |
tree | 2d6a4d9e87785a8bc236215e5e0102a553a0ee5f /indra/newview/llinventorybridge.h | |
parent | 7714c7679da7c6c28c3f3f09af6b586a680dc26c (diff) | |
parent | 19bc1ee671df2f89d990dfe8aadea1d9ea424e82 (diff) |
Pull in viewer-lion to cut off DRTVWR-373
Diffstat (limited to 'indra/newview/llinventorybridge.h')
-rwxr-xr-x | indra/newview/llinventorybridge.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/indra/newview/llinventorybridge.h b/indra/newview/llinventorybridge.h index 7dac830098..833fbbadbb 100755 --- a/indra/newview/llinventorybridge.h +++ b/indra/newview/llinventorybridge.h @@ -158,7 +158,7 @@ protected: BOOL isAgentInventory() const; // false if lost or in the inventory library BOOL isCOFFolder() const; // true if COF or descendant of BOOL isInboxFolder() const; // true if COF or descendant of marketplace inbox - BOOL isOutboxFolder() const; // true if COF or descendant of marketplace outbox + BOOL isOutboxFolderDirectParent() const; const LLUUID getOutboxFolder() const; @@ -172,6 +172,10 @@ protected: const LLUUID& new_parent, BOOL restamp); void removeBatchNoCheck(std::vector<LLFolderViewModelItem*>& batch); + +public: + BOOL isOutboxFolder() const; // true if COF or descendant of marketplace outbox + protected: LLHandle<LLInventoryPanel> mInventoryPanel; LLFolderView* mRoot; |