diff options
author | Mnikolenko ProductEngine <mnikolenko@productengine.com> | 2014-07-03 10:50:31 +0300 |
---|---|---|
committer | Mnikolenko ProductEngine <mnikolenko@productengine.com> | 2014-07-03 10:50:31 +0300 |
commit | 614a0ab6bd899abe06f5b9f25ac36f44966702f0 (patch) | |
tree | 9f1739fd5dab1eb63f3f1dff44957b416c9a3ca9 /indra/newview/llinventorybridge.h | |
parent | b6710fe6b53c3266adbcea11d1ea7c4cb5cabcc1 (diff) |
MAINT-2570 FIXED Don't allow attaching or opening items from Merchant Outbox.
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; |