summaryrefslogtreecommitdiff
path: root/indra/newview/llinventorybridge.cpp
AgeCommit message (Collapse)Author
2012-06-22Merge cleanupDave Parks
2012-06-22mergeDave Parks
2012-04-14DRTVWR-136: Remove redundant remove_(item|category)() functions.Nat Goodspeed
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-13merge changes for drtvwr-136Oz Linden
2012-03-30merge changes for vmrg-233Oz Linden
2012-03-27CHOP-854: move change_(item|category)_parent() into LLInventoryModel.Nat Goodspeed
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-22Automated merge with http://hg.secondlife.com/viewer-releaseRichard Linden
2012-03-16EXP-1915 : Fetch recursively folders when selectedMerov Linden
2012-03-16EXP-1841 : pull from current viewer-experience.Merov Linden
2012-03-13EXP-1915 : Rewrote the fetching mechanism for folders making it truly recursive.Merov Linden
2012-03-13CHUI-56 FIXED Fixed a crash when deleting multiple inventory folders.Vadim ProductEngine
2012-03-12EXP-1914 : Fix the evaluation of isClipboardPasteable() when the clipboard ↵merov
is in cut mode.
2012-03-09EXP-1915 : Disable copy/cut options for folders as long as all items in them ↵Merov Linden
are not present.
2012-03-09merge changes for vmrg-225Oz Linden
2012-03-09merge changes for vmrg-230Oz Linden
2012-03-05EXP-1917 : Fix items coming back in folders when quit after cut.Merov Linden
2012-03-01EXP-1841 : Use instance instead of getInstance on LLClipboard singleton.Merov Linden
2012-03-01Pull from viewer-experienceMerov Linden
2012-02-23Automated merge with ssh://hg.lindenlab.com/richard/viewer-experienceRichard Linden
2012-02-23EXP-1335 FIXED empty folders not draggable between Inventory windows.Seth ProductEngine
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-23EXP-1908 FIXED (Gesture floater is not refreshed when deleting more then one ↵paulgproductengine
gesture from Inventory) - Updating moved items, to update model's modify mask.
2012-02-22Windows build fix.Seth ProductEngine
2012-02-22EXP-1335 FIXED Dragging folders into Recent Items disabled.Seth ProductEngine
- 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-17EXP-1897 : Suppress the copy of UUID on text clipboard when copy/cut items ↵Merov Linden
(back to old behavior).
2012-02-17EXP-1894 : Fix the handling of no-copy items on the clipboard (can cut, can ↵Merov Linden
paste once but not twice and cannot copy). Also work on folders with no-copy items.
2012-02-17EXP-1902, EXP-1903 : Move items cut to the trash when clipboard reset.Merov Linden
2012-02-13EXP-1863 : Add comment and dead code cleanupMerov Linden
2012-02-09EXP-1863 : Implemented cut, copy, paste for folders. Issues with folder ↵Merov Linden
filtering though.
2012-02-09EXP-1844 FIX Selecting a large number of inventory items can block the ↵Richard Linden
viewer for a long time. only show hourglass and fetching text when downloading folders, not item metadata
2012-02-09Enabled the 'Merchant Outbox' menu item and context menuLeslie Linden
2012-02-08STORM-1807 Play animation floater 2nd play button active while animation is ↵Jonathan Yap
playing
2012-02-07EXP-1841 : Final deep scrub on LLClipboard API, clean up the use of copy and ↵Merov Linden
cut everywhere.
2012-02-07EXP-1873 : Implement cut in the inventory contextual menu. Works without ↵Merov Linden
deleting the items but simply dimming them and moving them. Doesn't work for folders yet.
2012-02-06EXP-1841 : Refactoring of LLClipboard, simplify the API and make it behave ↵Merov Linden
like a normal clipboard.
2012-02-06Automated merge with http://hg.secondlife.com/viewer-developmentRichard Linden
2012-02-03EXP-1862 : Suppress LLInventoryClipboard, move its functions to the unified ↵Merov Linden
LLClipboard and use this only
2012-02-03EXP-1868 FIX Remove Merchant Outbox from Me menuRichard Linden
removed merchant outbox context menu reviewed by Leslie
2012-02-02EXP-1856 FIX -- Calling cards, library items, 'no transfer' objects can be ↵Leslie Linden
copied to Merchant outbox via ctrl-v * Viewer now applies the same logic as inventory drag and drop to clipboard paste operations.
2012-01-26EXP-1844 FIX Selecting a large number of inventory items can block the ↵Richard Linden
viewer for a long time.
2012-01-26EXP-1335 FIXED Enabled DnD and sorting items in Recent tab of My inventory.Seth ProductEngine
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-23Reverting background fetch on an item to the old fetFromServer call to fix ↵Leslie Linden
regression bug in inventory late loading
2012-01-23EXP-1799 FIX -- Replace and Add to Outfit options and Copy to Merchant ↵Leslie Linden
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-20* Modified so "Copy" context menu option is not available for "no copy" items.Leslie Linden
2012-01-20EXP-1799 FIX -- Replace and Add to Outfit options appear as grayed out in ↵Leslie Linden
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-20EXP-1799 FIX -- Replace and Add to Outfit options appear as grayed out in ↵Leslie Linden
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-19EXP-1829 FIX -- Selecting a valid item last allows other selected invalid ↵Leslie Linden
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-17EXP-1805 FIX -- Block calling cards from being added to Merchant OutboxLeslie Linden
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-17Latest from viewer-ddLeslie Linden
2012-01-17EXP-1799 FIX -- Replace and Add to Outfit options appear as grayed out in ↵Leslie Linden
Inventory * Updated context menu code to enable visible items that aren't explicitly disabled.
2012-01-17Merge with viewer-dd, attempt #1Leslie Linden