summaryrefslogtreecommitdiff
path: root/indra/newview/llinventoryfunctions.cpp
AgeCommit message (Collapse)Author
2012-08-09Pull and merge from ssh://hg@bitbucket.org/lindenlab/viewer-development.Todd Stinson
2012-07-02CHUI-101 WIP Make LLFolderView general purposeRichard Linden
started to remove newview dependencies from llfolder*
2012-07-02MAINT-971 : [PUBLIC]Renaming a new inventory item while filtering item namessimon@Simon-PC.lindenlab.com
renames parent folder instead. Reviewed by Kelly
2012-06-27CHUI-101 WIP Make LLFolderView general purposeRichard Linden
moved filtering logic to viewmodel
2012-06-15CHUI-101 WIP Make LLFolderView general purposeRichard Linden
continuing fixing build errors renamed llfoldervieweventlistener.h to llfolderviewmodel.h
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-13fix merge conflict in remove_itemOz Linden
2012-04-13merge changes for drtvwr-136Oz 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-22CHUI-68 FIX Using arrow keys to scroll through inventory folders does not ↵Richard Linden
scroll content in view as a side effect, "My Inventory" is not selected by default auto selection of filtered items now reliably turns itself off as soon as user scrolls or moves keyboard focus to inventory
2012-02-16EXP-1896 : Prevent recursively copying of folders onto themselvesMerov Linden
2012-02-09EXP-1863 : Implemented cut, copy, paste for folders. Issues with folder ↵Merov Linden
filtering though.
2012-02-08EXP-1873 : Move cut items to trash in cut/copy over cut situations.Merov Linden
2012-02-03EXP-1862 : Suppress LLInventoryClipboard, move its functions to the unified ↵Merov Linden
LLClipboard and use this only
2012-01-17EXP-1804 FIX -- Drag and drop operations can be blocked by modal dialogsLeslie Linden
* Added support for marketplace notifications that don't display the dialog until the next frame, leaving room for the drag and drop operation to properly complete before the notification shows up and interferes.
2012-01-17EXP-1803 CLEAN-UP -- Modified code to use the "unique" tag on the notification.Leslie Linden
2012-01-13EXP-1803 FIX -- Notify the user when a folder is automatically created for ↵Leslie Linden
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-12EXP-1795 FIX -- Update warning dialog for dragging and dropping no-copy ↵Leslie Linden
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-05EXP-1753 FIX -- Open Merchant Outbox floater when user selects copy to ↵Leslie Linden
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
2011-12-13EXP-1715 FIX -- Merchant outbox drag and drop has offset between mouse ↵Leslie Linden
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-13EXP-1679 FIX -- Collapse links that are dragged to the outboxLeslie Linden
* Links are automatically tracked back to their source when dragged to the outbox * Worn items are now allowed into the outbox
2011-10-17EXP-1359 FIX -- Selecting New Inventory window from gear menu in Inventory ↵Leslie Linden
panel opens old My Inventory panel * Removed old inventory panel. * Renamed new inventory panel from "my_inventory" to "inventory" Reviewed by Richard.
2011-09-29EXP-1209 FIXED Sidetray removed.Paul ProductEngine
- Removed all sidetray dependencies and the sidetray itself. - Also removed LLFloaterSidetrayTab and LLSidetrayListener as unused.
2011-09-27EXP-1225 FIXED Added a floater for My Inventory side tab.Seth ProductEngine
- Replaced calls to LLSideTray with LLFloaterSidePanelContainer. - Added LLFloaterSidePanelContainer::getPanel<T>() for getting custom type panels.
2011-08-30EXP-857 PROGRESS -- Add context menu entries as alternate path to populate ↵leslie@leslie-HPz600.lindenlab.com
outbox * Folders containing items being worn now have the "Copy to Marketplace" context menu item disabled.
2011-08-16EXP-1093 User can place multiple copies of a no-copy item in merchant outbox ↵Leyla Farazha
to sell and can cause viewer to crash
2011-08-15deleting folders after no-copy move to outboxLeyla Farazha
2011-08-12EXP-843 Enable drag and drop from the outboxLeyla Farazha
EXP-1036 Disable most inventory functionality for the outbox view
2011-03-09Automated merge up from viewer-development into mesh-developmentLoren Shih
2011-02-22STORM-28 FIXED Added the ability to send agent's own calling card to others.Seth ProductEngine
- Added creating own calling card for the user to be able to share it with other residents. - Moved calling cards synchronization with friends list to the viewer start up. Previously synchronized upon opening the Friends tab in People side panel. - Calling cards for non-friends are not removed upon calling cards synchronization with friends list. - Enabled "Share" menu item for calling cards in inventory.
2011-01-13Automated merge up from viewer-developmentLoren Shih
2011-01-04STORM-702 FIXED Made it possible to wear partial outfitsVadim ProductEngine
Enabled the "Replace Current Outfit" option for incomplete outfits (i.e. those that don't contain full set of body parts).
2010-10-27Automated merge up from viewer-developmentLoren Shih
2010-10-20STORM-311 FIXED "Share" button in My Inventory SP was not updated on Current ↵Vadim ProductEngine
Outfit changes. When you wear an inventory item, the code that disables/enables the button was called as soon as the item got linked to COF, before it actually appeared on your avatar. However to determine whether to enable the button, the code checked avatar appearence. I fixed it to take the COF link into account, i.e. to treat items linked to COF as worn (=not shareable), no matter has appearance been updated or not.
2010-10-13correct licenses (fix problem with license change merge)Oz Linden
2010-08-24Backed out changeset c3d41f18ce2bTofu Linden
back-out the back-out for this branch. yay.
2010-08-24Backed out changeset a62bf7c0af21Tofu Linden
Backing out this merge that I pushed (prematurely) to the wrong place.
2010-08-24merge heads. whew.Tofu Linden
2010-08-13Change license from GPL to LGPL (version 2.1)Oz Linden
2010-08-02Redo the same merge as in changeset "2026f824953f", but this time with ↵Christian Goetze (CG)
feeeeling.
2010-07-30Merge from q/viewer-release to dessie/viewer-release for 2.1.1 beta 1Kent Quirk
2010-08-25mergeDave Parks
2010-07-27Backed out changeset: 58571b4e704bRichard Linden
2010-07-27EXT-8491 FIXED Crash in LLAppearanceMgr::addCOFItemLink().Vadim Savchuk
Reason: When you click on a clothing link in COF, LLAppearanceMgr::wearItemOnAvatar() removes all COF links of the clicked wearable type -- thus invalidating all previously obtained LLViewerInventoryItems for those links -- and then passes such an invalid item (item_to_wear) to addCOFItemLink() which of course crashes. Fix: 1. Handle this case in wearItemOnAvatar(): don't try wearing COF items. 2. Disable the Wear button in the inventory SP when a COF item is selected. 3. Fixed get_can_item_be_worn() to return FALSE for items which are in COF or have links in COF. Reviewed by Nyx at https://codereview.productengine.com/secondlife/r/811/ --HG-- branch : product-engine
2010-07-28EXT-8258 ADDITIONAL FIX Enable the 'Trash' button in 'My Inventory' when a ↵Vadim Savchuk
selected item gets worn. This is an additional fix to the one approved in https://codereview.productengine.com/secondlife/r/772/. Looks like sometimes get_is_item_worn() fails to determine that an item is actually worn. I suppose it happens when the item is already linked to COF but not yet known to LLAgentWearables. So I try fixing it by adding a COF links check to get_is_item_worn(), so that an item is considered worn as soon as it's linked to COF. Reviewed by Nyx at https://codereview.productengine.com/secondlife/r/822/ --HG-- branch : product-engine
2010-07-28merge from viewer-releaseTofu Linden
2010-07-27Performed necessary refactoring after merge rev. 14093:babb41195f70Alexei Arabadji
--HG-- branch : product-engine
2010-07-28EXT-8258 ADDITIONAL FIX Enable the 'Trash' button in 'My Inventory' when a ↵Vadim Savchuk
selected item gets worn. This is an additional fix to the one approved in https://codereview.productengine.com/secondlife/r/772/. Looks like sometimes get_is_item_worn() fails to determine that an item is actually worn. I suppose it happens when the item is already linked to COF but not yet known to LLAgentWearables. So I try fixing it by adding a COF links check to get_is_item_worn(), so that an item is considered worn as soon as it's linked to COF. Reviewed by Nyx at https://codereview.productengine.com/secondlife/r/822/ --HG-- branch : product-engine
2010-07-28merge from viewer-releaseTofu Linden
2010-07-27Performed necessary refactoring after merge rev. 14093:babb41195f70Alexei Arabadji
--HG-- branch : product-engine