diff options
author | leslie@leslie-HPz600.lindenlab.com <leslie@leslie-HPz600.lindenlab.com> | 2011-08-26 16:33:47 -0700 |
---|---|---|
committer | leslie@leslie-HPz600.lindenlab.com <leslie@leslie-HPz600.lindenlab.com> | 2011-08-26 16:33:47 -0700 |
commit | c2443b95d3cd9f0f26e5e8f5c2dbeb5f6c307447 (patch) | |
tree | 70ca348ba23a2a38f5e53b07f5135064c28dabad /indra/newview/llinventorybridge.h | |
parent | e11e794716368257792c3ccce60ba7709e0f29e0 (diff) |
EXP-1126 FIX -- Cannot use arrow keys to scroll up and down in Inbox and Outbox
EXP-1003 FIX -- Renaming a folder in Received Items panel resets the New flag for that folder
EXP-1001 FIX -- Newness is removed on next login if you log out or crash before opening inventory panel
EXP-857 FIX -- Add context menu entries as alternate path to populate outbox
EXP-858 FIX -- Outbox sync failure error handling
EXP-1158 FIX -- Viewer crash when deleting items from Outbox when some folders are open
* Made inbox, outbox and inventory panels all legit tab stops for keyboard focus
* Added mouse over indication on inventory panel primarily for increased clarity on outbox error messages
* Disabled "Rename" option on inbox items
* Added context menu option to copy/move an item to the merchant outbox
* Context menu option to copy/move to outbox is visible and/or enabled/disabled when appropriate
* "LastInventoryInboxCollapse" no longer written out as a setting when the panel is not visible
* Fixed up collapse time check to not try to parse empty string on first load (deminishes text spam in log greatly)
* Disabled double-click as a way to equip items in the inbox or outbox
* Viewer code no longer removes items from the outbox after sync. We rely on the sim to do this now.
* Basic outbox sync error handling now displays error messages as tooltips along with badge over item in outbox
* Moved some scroll container default values out of code and into xml
Diffstat (limited to 'indra/newview/llinventorybridge.h')
-rw-r--r-- | indra/newview/llinventorybridge.h | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/indra/newview/llinventorybridge.h b/indra/newview/llinventorybridge.h index 4a64df1371..2d625befb4 100644 --- a/indra/newview/llinventorybridge.h +++ b/indra/newview/llinventorybridge.h @@ -52,7 +52,7 @@ typedef std::vector<std::string> menuentry_vec_t; // // You'll want to call LLInvItemFVELister::createBridge() to actually create // an instance of this class. This helps encapsulate the -// funcationality a bit. (except for folders, you can create those +// functionality a bit. (except for folders, you can create those // manually...) //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ class LLInvFVBridge : public LLFolderViewEventListener @@ -70,6 +70,8 @@ public: virtual ~LLInvFVBridge() {} BOOL canShare() const; + BOOL canListOnMarketplace() const; + BOOL canListOnMarketplaceNow() const; //-------------------------------------------------------------------- // LLInvFVBridge functionality @@ -141,7 +143,9 @@ protected: BOOL isAgentInventory() const; // false if lost or in the inventory library BOOL isCOFFolder() const; // true if COF or descendent of BOOL isInboxFolder() const; // true if COF or descendent of marketplace inbox - BOOL isOutboxFolder() const; // true if COF or descendent of marketplace inbox + BOOL isOutboxFolder() const; // true if COF or descendent of marketplace outbox + const LLUUID getOutboxFolder() const; + virtual BOOL isItemPermissive() const; static void changeItemParent(LLInventoryModel* model, LLViewerInventoryItem* item, @@ -210,8 +214,7 @@ public: /*virtual*/ void clearDisplayName() { mDisplayName.clear(); } LLViewerInventoryItem* getItem() const; - bool isAddAction(std::string action) const; - bool isRemoveAction(std::string action) const; + protected: BOOL confirmRemoveItem(const LLSD& notification, const LLSD& response); virtual BOOL isItemPermissive() const; |