Commit Graph

559 Commits (de1e1db9600a03ab5b0dc3f04a5bdcee30632f05)

Author SHA1 Message Date
Nat Goodspeed ee87fd975f DRTVWR-136: Remove redundant remove_(item|category)() functions.
Incoming changes from two different project repos left viewer-development with
LLInventoryModel::removeItem() and removeCategory() plus free functions
remove_item() and remove_category() in llinventoryfunctions.cpp.
remove_category() was actually the better implementation; migrated its body
into LLInventoryModel::removeCategory(). Clearly the previous state of affairs
-- with LLInventoryModel::removeItem() plus a remove_category() free function
in a very different source file -- fooled two different developers into
overlooking the other of the pair. Unfortunately we each added different
"missing" functions, leaving us with a complete set of four.
Fix existing references to remove_item() and remove_category() free functions.
2012-04-14 22:23:24 -04:00
Oz Linden f79b775fcc merge changes for drtvwr-136 2012-04-13 20:55:47 -04:00
Oz Linden 74d199c1dd merge changes for vmrg-233 2012-03-30 15:56:38 -04:00
Nat Goodspeed fdd018783a CHOP-854: move change_(item|category)_parent() into LLInventoryModel.
It's not really clear why they're in llinventoryfunctions.{h,cpp} instead of
LLInventoryModel, and in fact LLInventoryModel::removeItem() already contains
code essentially cloned from change_item_parent() -- or perhaps vice-versa.
This changeset addresses only migrating the functions, and fixing up existing
references, to simplify code review.
2012-03-27 18:40:17 -04:00
Richard Linden d6d1cb852d Automated merge with http://hg.secondlife.com/viewer-release 2012-03-22 10:58:04 -07:00
Merov Linden 86c572ad63 EXP-1915 : Fetch recursively folders when selected 2012-03-16 15:58:05 -07:00
Merov Linden 356c29c888 EXP-1841 : pull from current viewer-experience. 2012-03-16 13:43:42 -07:00
Merov Linden 8270054805 EXP-1915 : Rewrote the fetching mechanism for folders making it truly recursive. 2012-03-13 21:08:10 -07:00
Vadim ProductEngine 1c51271d56 CHUI-56 FIXED Fixed a crash when deleting multiple inventory folders. 2012-03-13 15:05:51 +02:00
merov 0df0218329 EXP-1914 : Fix the evaluation of isClipboardPasteable() when the clipboard is in cut mode. 2012-03-12 17:21:32 -07:00
Merov Linden 4ffad9495c EXP-1915 : Disable copy/cut options for folders as long as all items in them are not present. 2012-03-09 17:15:48 -08:00
Oz Linden 633bd44b4a merge changes for vmrg-225 2012-03-09 12:58:50 -05:00
Oz Linden 0a87371567 merge changes for vmrg-230 2012-03-09 12:56:48 -05:00
Merov Linden 85d380b210 EXP-1917 : Fix items coming back in folders when quit after cut. 2012-03-05 20:03:21 -08:00
Merov Linden f0a1b43f22 EXP-1841 : Use instance instead of getInstance on LLClipboard singleton. 2012-03-01 21:35:05 -08:00
Merov Linden 24789f11cc Pull from viewer-experience 2012-03-01 13:31:17 -08:00
Richard Linden f4a122b6d7 Automated merge with ssh://hg.lindenlab.com/richard/viewer-experience 2012-02-23 12:40:27 -08:00
Seth ProductEngine 11d29660aa EXP-1335 FIXED empty folders not draggable between Inventory windows.
Added filtering empty folders as any other folder view item.
This enables dragging empty folders between Inventory floaters when they pass the filter.
2012-02-23 21:47:03 +02:00
paulgproductengine af83268a7b EXP-1908 FIXED (Gesture floater is not refreshed when deleting more then one gesture from Inventory)
- Updating moved items, to update model's modify mask.
2012-02-23 19:51:43 +02:00
Seth ProductEngine d5d2147a97 Windows build fix. 2012-02-22 23:11:29 +02:00
Seth ProductEngine 26d33527a3 EXP-1335 FIXED Dragging folders into Recent Items disabled.
- Dragging folder into Recent Items disabled, but allowed within Recent Items.
- Dragging Contents folder from task inventory disabled.
- Filtering folder contents upon dragging to any inventory panel added, to make the behavior consistent with items filtering during DnD.
2012-02-22 22:33:57 +02:00
Merov Linden 2fdb18971b EXP-1897 : Suppress the copy of UUID on text clipboard when copy/cut items (back to old behavior). 2012-02-17 17:43:54 -08:00
Merov Linden 39e9a17c11 EXP-1894 : Fix the handling of no-copy items on the clipboard (can cut, can paste once but not twice and cannot copy). Also work on folders with no-copy items. 2012-02-17 16:57:29 -08:00
Merov Linden bb6ace0672 EXP-1902, EXP-1903 : Move items cut to the trash when clipboard reset. 2012-02-17 14:42:12 -08:00
Merov Linden 632c8c138c EXP-1863 : Add comment and dead code cleanup 2012-02-13 10:09:33 -08:00
Merov Linden 2a4aa438f5 EXP-1863 : Implemented cut, copy, paste for folders. Issues with folder filtering though. 2012-02-09 23:37:24 -08:00
Richard Linden 4523b31378 EXP-1844 FIX Selecting a large number of inventory items can block the viewer for a long time.
only show hourglass and fetching text when downloading folders, not item metadata
2012-02-09 12:58:43 -08:00
Leslie Linden 94b8cd3fa6 Enabled the 'Merchant Outbox' menu item and context menu 2012-02-09 09:27:18 -08:00
Jonathan Yap 039c50f2b4 STORM-1807 Play animation floater 2nd play button active while animation is playing 2012-02-08 15:41:27 -05:00
Merov Linden ee3c3c15b7 EXP-1841 : Final deep scrub on LLClipboard API, clean up the use of copy and cut everywhere. 2012-02-07 22:46:04 -08:00
Merov Linden c744603af9 EXP-1873 : Implement cut in the inventory contextual menu. Works without deleting the items but simply dimming them and moving them. Doesn't work for folders yet. 2012-02-07 17:13:24 -08:00
Merov Linden 9761375ac2 EXP-1841 : Refactoring of LLClipboard, simplify the API and make it behave like a normal clipboard. 2012-02-06 15:43:53 -08:00
Richard Linden 2ed1de224a Automated merge with http://hg.secondlife.com/viewer-development 2012-02-06 15:28:45 -08:00
Merov Linden db824cff75 EXP-1862 : Suppress LLInventoryClipboard, move its functions to the unified LLClipboard and use this only 2012-02-03 18:38:03 -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