Commit Graph

526 Commits (ca80e17e90ce5b70feca76ddf41d3c25d01ac830)

Author SHA1 Message Date
Richard Linden 2ed1de224a Automated merge with http://hg.secondlife.com/viewer-development 2012-02-06 15:28:45 -08:00
Richard Linden a89fbc1d33 EXP-1868 FIX Remove Merchant Outbox from Me menu
removed merchant outbox context menu
reviewed by Leslie
2012-02-03 11:14:54 -08:00
Leslie Linden c1e47e0aca EXP-1856 FIX -- Calling cards, library items, 'no transfer' objects can be copied to Merchant outbox via ctrl-v
* Viewer now applies the same logic as inventory drag and drop to clipboard
  paste operations.
2012-02-02 12:22:00 -08:00
Richard Linden ce9ff40c64 EXP-1844 FIX Selecting a large number of inventory items can block the viewer for a long time. 2012-01-26 12:11:22 -08:00
Seth ProductEngine a2626f0ee8 EXP-1335 FIXED Enabled DnD and sorting items in Recent tab of My inventory.
Added filtering the items on DnD, allowing to drop only the items which pass the filter in the destinatination inventory panel.
Added filtering the items from object contents and notecards.
Changed handle type for LLInventoryPanel in LLInvFVBridge to remove some extra dynamic casts.
2012-01-26 01:41:14 +02:00
Leslie Linden ea6cbc7b6b Reverting background fetch on an item to the old fetFromServer call to fix regression bug in inventory late loading 2012-01-23 15:55:36 -08:00
Leslie Linden e2d4309ba5 EXP-1799 FIX -- Replace and Add to Outfit options and Copy to Merchant Outbox options can appear in invalid state when a valid folder is last selection
EXP-1834 FIX -- Right click context menus on Folders in Merchant Outbox and Library folders can show all inventory options including admin options
EXP-1835 FIX -- Right clicking on a folder and selecting New Folder creates folder under My Inventory not within selected folder

* Updated folder context menu building to build full options in one step or
  trigger a load which will rebuild top-level context menu for all selected
  items when complete.  Previous code had an implicit assumption that the
  selected folder was the only selection after background fetch.
2012-01-23 11:45:47 -08:00
Leslie Linden 039cd701c4 * Modified so "Copy" context menu option is not available for "no copy" items. 2012-01-20 16:36:25 -08:00
Leslie Linden c8a2f6515a EXP-1799 FIX -- Replace and Add to Outfit options appear as grayed out in Inventory
* Refactored LLFolderBridge::buildContextMenu fetch to clear and rebuild basic
  context menu options after the fetch rather than trying to merge the two.
2012-01-20 16:10:32 -08:00
Leslie Linden a73013f708 EXP-1799 FIX -- Replace and Add to Outfit options appear as grayed out in Inventory
* Modified build context menu code to not disable items that are invisible so
  secondary background fetch can coalesce menu options with proper state.
* Removed "Move to Merchant Outbox" context menu option.
2012-01-20 13:41:43 -08:00
Leslie Linden 216ac70043 EXP-1829 FIX -- Selecting a valid item last allows other selected invalid items to be copied to Outbox with context menu option
* Updated context menu default enabled state to use the last state rather than
  TRUE.  Once per frame, the states are all reset to TRUE so this has the effect
  of AND'ing together successive buildContextMenu functions rather than ignoring
  previous states.
2012-01-19 15:24:29 -08:00
Leslie Linden accf833945 EXP-1805 FIX -- Block calling cards from being added to Merchant Outbox
EXP-1810 PROGRESS -- Cannot resize Received items panel in Inventory window

* Updated "copy to merchant outbox" context menu and drag and drop code to block calling cards.
* Changed user_resize to true on the "Received Items" panel and the main inventory panel
2012-01-17 13:07:57 -08:00
Leslie Linden 944814941d Latest from viewer-dd 2012-01-17 11:46:05 -08:00
Leslie Linden 3a313469c9 EXP-1799 FIX -- Replace and Add to Outfit options appear as grayed out in Inventory
* Updated context menu code to enable visible items that aren't explicitly disabled.
2012-01-17 11:44:40 -08:00
Leslie Linden dc0573be6c Merge with viewer-dd, attempt #1 2012-01-17 11:07:11 -08:00
Leslie Linden 577479a3e5 EXP-1803 CLEAN-UP -- Modified code to use the "unique" tag on the notification. 2012-01-17 09:36:14 -08:00
Richard Linden 5e5105bd22 EXP-1770 WIP Drag and drop visual selection can be off across hierarchies
added throttling to fetchInventoryItem queries
2012-01-13 18:37:50 -08:00
Leslie Linden 6b919e324e EXP-1803 FIX -- Notify the user when a folder is automatically created for them in the outbox
* New confirmation dialog lets them know when a folder was automatically created to contain an item dragged/copied to the outbox.
2012-01-13 16:36:57 -08:00
Leslie Linden ba41aea4b2 EXP-1795 FIX -- Update warning dialog for dragging and dropping no-copy items to Merchant Outbox
* Any drag and drop or copy operation to the merchant outbox that contains one
  or more no-copy items now brings up a single modal dialog prompting the user
  to move the no-copy items to the outbox or to leave them all behind.
2012-01-12 17:01:23 -08:00
Leslie Linden 6452154b19 Correcting logic back to way it was, to make sure invalid objects can not be copied to the outbox 2012-01-11 16:53:08 -08:00
Leslie Linden 542c31d547 EXP-1788 FIX -- Outbox drag and drop restrictions can be bypassed if inventory not fully loaded
* The "Copy to Outbox" option is now disabled when the item is in the loading state.
2012-01-11 13:37:43 -08:00
Leslie Linden 1422be8312 Merge from viewer-development 2012-01-09 09:56:52 -08:00
Leslie Linden 60df5e51dc EXP-1220 GROUNDWORK -- Create context menu entry to allow import of selected item(s)
* Added a context menu for "Send to Marketplace" but disabled the code to show it
  until we decide to move forward with this feature.
* Made some progress unifying the context menu in the outbox for different types
  of items.  (mesh, audio, etc.)
2012-01-06 13:01:17 -08:00
Aura Linden bd3a652eab Add capability-based create folder routine for more reliable inventory, with fix for copy and wear 2012-01-06 07:46:53 -05:00
Leslie Linden 26998a5e38 EXP-1753 FIX -- Open Merchant Outbox floater when user selects copy to Merchant Outbox context menu option in Inventory
* Modified "copy to merchant outbox" and "move to merchant outbox" context menu actions to also open the merchant outbox floater
* Changed context menu behavior to always preserve disabled menu items on multiselect rather than occasionally ignoring it
2012-01-05 12:42:58 -08:00
Leslie Linden 912833bafa EXP-1738 FIX -- Disable drag and drop to folders in the outbox that would create a hierarchy that contains too many folders
* Updated drag and drop to correctly handle moving to and from outbox as opposed to within the outbox when dealing with
  folder and item count limitations related to depth and total folder count.
2012-01-04 14:04:32 -08:00
Leslie Linden 2a3b7f295f EXP-1755 FIX -- Can move items to Merchant Outbox during Outbox synch using Copy to Merchant Outbox context menu
* "Copy to Merchant Outbox" context menu option no longer available when marketplace import is in progress.
2011-12-20 14:41:30 -08:00
Leslie Linden 11e192d9a7 EXP-1738 FIX -- Disable drag and drop to folders in the outbox that would create a hierarchy that contains too many folders
EXP-1743 FIX -- Tooltip errors given when dragging and dropping folders onto themselves in Merchant Outbox

* Top level folder now reflected in folder count for total folders
* Earlier rejections now honored in drag and drop code so outbox-specific tooltips only show up when appropriate
2011-12-20 11:43:02 -08:00
Leslie Linden 6c26fdea4d EXP-1741 FIX -- Learn more link goes to page not found from Outbox for user that is not a merchant an Agni
EXP-1746 FIX -- Update Outbox messaging
EXP-1748 FIX -- Close down on messaging with Spinner
MKT-3403 support -- viewer tooltips updated to match errors in marketplace

* Copy has been updated to match the design per Leo and Brooke
* Marketplace URL's have also been updated
* The outbox floater now reports a status string in the existing folder count control
2011-12-19 16:46:26 -08:00
Leslie Linden a0929f39ca EXP-1170 FIX -- Right click context menu to Copy to Outbox shown if user is not a merchant
* The context menu option is no longer shown if the user does not have an outbox.
2011-12-19 13:58:36 -08:00
Leslie Linden ac01fb0e03 EXP-1683 FIX -- Add main inventory context menu option Copy To Outbox
* The logic to determine whether or not the "Copy to Merchant Outbox" item is available is now tied to drag and drop functionality.
2011-12-19 13:55:53 -08:00
Leslie Linden 5b6fe3a838 EXP-1730 FIX -- Library items can be dragged and dropped to Outbox floater and folders are not created for items
* Updated to proper tooltip string
2011-12-16 16:35:21 -08:00
Leslie Linden 1677867786 EXP-1738 FIX
EXP-1739 FIX

* Initial pass to block drag and drop of multiple items when resultant outbox folder would contain too many items or folders.
2011-12-16 10:43:57 -08:00
Leslie Linden f1edfc73ef EXP-1726 FIX -- Rename option present in context menu when selecting multiple folders in Outbox 2011-12-15 16:21:35 -08:00
Leslie Linden b6af1b47f1 Windows build fix and fixes for off-by-1 errors in limitations 2011-12-15 15:09:02 -08:00
Leslie Linden 2e564abcd6 EXP-1730 FIX
EXP-1731 FIX
EXP-1735 FIX
EXP-1736 FIX
EXP-1737 FIX
EXP-1738 FIX
EXP-1739 FIX

* Users can no longer drag and drop items to the outbox from in world, notecards or the library.
* Drag and drop now blocks the creation of hierarchies that are too deep, too many folders or contain too many items.
* Settings now exist to specify drag and drop limitations to the outbox, named:
       InventoryOutboxMaxFolderDepth (4)
       InventoryOutboxMaxFolderCount (20)
       InventoryOutboxMaxItemCount (200)
2011-12-15 14:26:42 -08:00
Leslie Linden 399f8dd191 EXP-1723 -- Improved drag and drop behavior for outbox floater. 2011-12-14 14:37:38 -08:00
Leslie Linden d7fabfee19 EXP-1715 FIX -- Merchant outbox drag and drop has offset between mouse position and selected folder
EXP-1717 FIX -- Drag and drop within the outbox can result in an item created at the top level of the outbox

Folders are now created for items dragged around within the merchant outbox if their drop target is the top level outbox inventory panel itself.
2011-12-13 13:56:41 -08:00
Leslie Linden a96271e3c2 EXP-1716 FIX -- Merchant outbox drag and drop always creates new folder
* Items dragged to child folder now appear under that folder rather than in new separate top-level folder.
2011-12-13 13:09:53 -08:00
Leslie Linden 2f14bed8b2 EXP-1714 FIX -- Add rename option to context menu on outbox folders 2011-12-13 11:40:36 -08:00
Leslie Linden 9fcdec3e34 EXP-1679 FIX -- Collapse links that are dragged to the outbox
* Links are automatically tracked back to their source when dragged to the outbox
* Worn items are now allowed into the outbox
2011-12-13 11:15:01 -08:00
Leslie Linden a7b04c9dd4 * Removed old inventory window outbox.
* Added centered progress indicator for outbox.
2011-12-09 10:31:16 -08:00
Leslie Linden 5918913063 First pass at connecting to the new marketplace API 2011-12-05 13:37:37 -08:00
Leslie Linden e919349054 Merge with viewer-experience 2011-11-29 10:40:45 -08:00
Merov Linden 7c2bbfc4fc EXP-1498, EXP-1595, EXP-1596 : Hide empty system folders in a dynamic way, turn the setting ON by default 2011-11-18 17:22:40 -08:00
Leslie Linden 2f55effd25 Merge 2011-11-14 11:29:02 -08:00
Merov Linden db371c9824 EXP-1498 : Hide empty system folders. System folders can be specifically marked to be hidden if empty in the LLViewerFolderDictionary constructor. 2011-11-11 23:58:37 -08:00
Merov Linden 652aa15ccd EXP-1505 : FIX. Dropping a folder in current outfit would result in broken links and lost inventory. 2011-11-04 11:46:38 -07:00
Leslie Linden 94678c2f7f EXP-1541 update -- Route inventory items sent in a Notecard to correct locations rather than auto-sorting by asset type
* New code specifies explicit destination for "copy from notecard" or null, indicating the sim should determine the placement.

Reviewed by Stone.
2011-11-04 11:26:50 -07:00
Leslie Linden f01aa16298 Merge from dd repo 2011-10-26 13:59:22 -07:00