Commit Graph

22599 Commits (bea2dfbc22bb2d80755dcf9daf810e1ea0329c2d)

Author SHA1 Message Date
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
Oz Linden 94673473ed merge changes for storm-1653 2011-12-15 16:06:08 -05:00
Oz Linden 916c4a79e5 merge changes for storm-1731 2011-12-15 16:05:26 -05:00
Oz Linden c0f5b24b54 merge changes for storm-1723 2011-12-15 16:04:40 -05:00
Oz Linden 1b6ee87bc8 merge changes for storm-1733 2011-12-15 16:03:34 -05:00
Alissa Sabre a94a923240 storm-1723: fix character display when a lot of different characters are used 2011-12-15 15:19:50 -05:00
Oz Linden 6b11c292c0 merge changes for vmrg-205 2011-12-15 12:57:40 -05: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
eli 6d520dcc1c WIP VWR-23642 2011-12-14 16:54:21 -08:00
Dave Parks 9fa68f0da3 SH-2743 Fix for shader compiler error on some GL 3.x implementations. 2011-12-14 17:55:36 -06:00
eli 0c5c88ff67 FIX VWR-23635 2011-12-14 15:18:59 -08:00
eli 190b9985c6 FIX VWR-22449 2011-12-14 14:57:34 -08:00
Jonathan Yap 821c964230 STORM-1736 Cropped buttons in the bottom of the Ad-hoc floater 2011-12-14 17:44:10 -05:00
eli d39b276b3c FIX VWR-22392 2011-12-14 14:38:28 -08:00
Leslie Linden 399f8dd191 EXP-1723 -- Improved drag and drop behavior for outbox floater. 2011-12-14 14:37:38 -08:00
eli 1e0f11df87 sync with viewer-development 2011-12-14 13:52:43 -08:00
Jonathan Yap fdc223287c STORM-1734 Update contributions.txt with Storm jira number 2011-12-14 13:58:46 -05:00
Jonathan Yap eb7b43fb55 STORM-1733 Menu entry Release Keys is in Advanced->Shortcuts sub-menu but has no shortcut 2011-12-14 13:21:48 -05:00
Vadim ProductEngine 6cefa46636 EXP-1635 FIXED Made it clear that inventory snapshots are limited to 512x512 px. 2011-12-14 17:12:40 +02:00
Vadim ProductEngine 82f043c333 EXP-1639 FIXED Fixed a resolution rounding error.
The error sometimes led to the following issues with maximized viewer window on MS Windows:
* displaying incorrect resolution
* failure to update snapshot
2011-12-14 15:26:13 +02: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
Debi King (Dessie) e4f1f611a4 merged .hgtags 2011-12-13 17:36:29 -05:00
Debi King (Dessie) d8aa31d10a Added tag DRTVWR-103_3.2.4-release, 3.2.4-release for changeset bd6bcde25844 2011-12-13 16:59:12 -05: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
Dave Parks 2dc7df91ad SH-2743 Fix for shader compiler error on some GL 3.x implementations. 2011-12-13 15:23:55 -06: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
Oz Linden ac94b66a08 storm-1729: ensure that cpu id has no leading or trailing spaces for ease of comparison and formatting 2011-12-13 15:58:34 -05:00
Dave Parks 4e92846cd5 SH-1427 Fix for redundantly applying light intensity to deferred lights. 2011-12-13 14:37:20 -06: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
Jonathan Yap 7f85f6be6a VWR-27832 L$ Transfer failures show alert as if successful 2011-12-12 20:07:34 -05: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
Dave Parks bccf5e6ca1 merge 2011-12-12 17:13:38 -06:00
Dave Parks 2b2a03b3c5 SH-2511 Fix for bumpmapped objects flickering. 2011-12-12 17:12:47 -06: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
Jonathan Yap 2c9db624fb STORM-1731 Adjusted if muted logic slightly 2011-12-12 14:48:36 -05:00
Leslie Linden ec30e6e70f Merge from viewer-development 2011-12-12 10:54:45 -08:00