Commit Graph

22144 Commits (2a3b7f295fa82d5d4826cfd912fd07ebbe5f9c21)

Author SHA1 Message Date
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 744484699c EXP-1749 FIX -- Merchant outbox import completion messages are to be modal dialogs
* Merchant outbox completion messages now shown as modal dialogs rather than window shades.
2011-12-19 17:29:17 -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 97a2663cf9 EXP-1745 FIX -- removed the merchant outbox from the toolbox 2011-12-19 11:25:14 -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 2beaa0585e Merge from viewer-experience 2011-12-16 16:02:47 -08:00
Leslie Linden 9a55888ec4 Merge from viewer-pre-beta for IM toasts crash fix 2011-12-16 16:02:04 -08:00
Leslie Linden 16b6a47247 EXP-1742 FIX -- Clicking IM notification or receiving multiple IM notifications in quick succession crashes to desktop
* Moved toast logic for mouse hover out of the draw call to avoid chain of callbacks that lead to reordering of the draw list while we are iterating over it.
2011-12-16 15:07:04 -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
Richard Linden 015f07408b Automated merge with ssh://hg.lindenlab.com/richard/viewer-experience 2011-12-15 15:40:40 -08:00
Richard Linden da94592d00 dummy commit to fix TeamCity 2011-12-15 15:39:54 -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 90e6336b27 EXP-1725 FIX -- Carriage return or tab characters shown in Outbox text on Windows
* Removed tabs from outbox strings.
2011-12-15 09:51:26 -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 bff737ebef EXP-1724 FIX -- Merchant outbox needs to be available from the Me menu 2011-12-13 17:03:25 -08:00
Leslie Linden bb39e3fa3c EXP-1718 FIX -- Drag and drop within the outbox can result in folders being out of order
* Outbox updates now result in a resort to keep drag and drop items and folders properly sorted
* New icon for merchant outbox
* New behavior to accept drag and drop files over the entire merchant outbox floater
2011-12-13 16:42:14 -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
Richard Linden 0c0ff35d19 EXP-1551 FIX Ability to toggle button flashing
added "EnableButtonFlashing" setting
2011-12-13 13:11:55 -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
Paul ProductEngine aba090ab90 EXP-1599 FIXED (Sharing multiple selected inventory folders only shares one folder (no warning for user))
- In case of sharing multiple folders, make the confirmation dialog contain a warning that only one folder can be shared at a time.
2011-12-13 17:27:54 +02:00
Leslie Linden 181eaa8196 EXP-1648 FIX
* Merchant outbox no longer crashes for non-merchants.
* Folder count is hidden for non-merchants.
* Drag and drop to merchant outbox floater is disabled for non-merchants.
2011-12-12 17:22:47 -08:00
Leslie Linden d3f06b2962 Fixed marketplace URL trailing '/' and updated to latest window shade code from viewer-experience 2011-12-12 17:04:58 -08:00
Leslie Linden 90b8fb07cc Merge with latest from viewer-experience 2011-12-12 16:13:23 -08:00
Leslie Linden e859c3446b Added missing line end to satisfy coding policy 2011-12-12 16:06:22 -08:00
Richard Linden 35feb03d27 EXP-1711 FIX LLWindowShade doesn't stack multiple notifications
added configurable shade color to window_shade
2011-12-12 15:50:10 -08:00
Leslie Linden e826cbd907 EXP-1682 FIX
EXP-1683 FIX
EXP-1705 FIX
EXP-1707 FIX

* Outbox folder count now uses inventory API directly rather than inventory folder view for folder count and item status
* Asynchronous fetches are triggered for the outbox content when the window is opened and when it receives focus
* Marketplace URL's for empty and non-merchant outbox view have been updated
* "Copy to Merchant Outbox" and "Delete" context menu items should be fully functional now with item counts, etc.
2011-12-12 15:02:52 -08:00
Richard Linden 2010e20122 Automated merge with ssh://hg.lindenlab.com/richard/viewer-experience 2011-12-12 12:33:03 -08:00
Richard Linden 40a74eb5b7 EXP-1711 FIX LLWindowShade doesn't stack multiple notifications 2011-12-12 12:32:22 -08:00
Leslie Linden ec30e6e70f Merge from viewer-development 2011-12-12 10:54:45 -08:00
Oz Linden dbc91a7fac increment viewer version to 3.2.6 2011-12-12 10:03:06 -05:00
Oz Linden 22ef5853ff Added tag 3.2.5-start for changeset 8a44ff3d2104 2011-12-12 10:02:28 -05:00
Oz Linden 0370711cf3 merge changes for vmrg-202 2011-12-12 09:05:18 -05:00
Oz Linden f1a4593e47 merge changes for vmrg-204 2011-12-12 09:04:33 -05:00
Oz Linden d7e6f21981 merge changes for vmrg-203 2011-12-12 09:03:59 -05:00
Seth ProductEngine 6114ce2d27 EXP-1672 FIXED Added check for LLChicletBar instance existence not to create a new one when viewer exits.
Could not reproduce the crash. This is a possible fix for EXP-1672.
The message before the crash in all client logs was: "WARNING: LLSingleton<class LLChicletBar>::getInstance: Trying to access deleted singleton class LLChicletBar creating new instance"
2011-12-12 13:32:23 +02:00
Leslie Linden cc92db1f35 Moved outbox import confirmations to window shades on the merchant outbox floater, rather than modal dialogs. 2011-12-09 16:19:03 -08:00
eli 18bc70e74f FIX VWR-27811 2011-12-09 15:57:40 -08:00
eli 978309c591 sync with viewer-development 2011-12-09 15:52:37 -08:00
Leslie Linden 8878a5e561 * Changed background opacity of outbox and inventory to match.
* Removed superfluous marketplace layout stack, leftover from inbox/outbox in same inventory window.
2011-12-09 12:29:33 -08:00
Leslie Linden a7b04c9dd4 * Removed old inventory window outbox.
* Added centered progress indicator for outbox.
2011-12-09 10:31:16 -08:00
Dave Parks 50a57ba9fe Backed out changeset fafd857891b1 2011-12-09 12:23:04 -06:00
Richard Linden 29570bdc96 Automated merge with ssh://hg.lindenlab.com/richard/viewer-experience 2011-12-09 10:13:02 -08:00
Oz Linden b93ad493b1 merge changes for vmrg-201 2011-12-09 11:51:03 -05:00