summaryrefslogtreecommitdiff
path: root/indra/newview/llinventorybridge.cpp
AgeCommit message (Collapse)Author
2010-01-22Merge from v2 trunk.Tofu Linden
2010-01-22merge.Tofu Linden
2010-01-22automated merge viewer2.0->viewer2.0Loren Shih
2010-01-22EXT-4492 : Deleting gestures from the wearing tab causes the viewer to crashLoren Shih
EXT-4660 : Can delete a bodypart from the COF through inventory view or WEARING tab delete key EXT-4662 : remove leading separator from COF right-click menu EXT-4633 : AppearanceSP trash button doesn't update enabled state correctly Bunch of UI fixes related to the trash/delete functionality in InventoryFloater/SP and AppearanceSP "WEARING" tab. The main idea is that we don't want to allow deletion of bodyparts and folder links from the COF by the user.
2010-01-22PE merge.Tofu Linden
2010-01-22EXT-4492 Deleting gestures from the wearing tab causes the viewer to crashLoren Shih
Revert removal of "delete" option from last checkin. Now enabling "delete" but checking if *this was deleted within removeItem().
2010-01-22Fixed major bug EXT-4609 Deleting duplicate calling cards also removes a ↵Mike Antipov
Resident from ur Friends list :( - removed separate logic for Residents in the Friends list when Calling card is removed --HG-- branch : product-engine
2010-01-21mergeRick Pasetto
2010-01-21EXT-4492 Deleting gestures from the wearing tab causes the viewer to crashLoren Shih
Removed "delete" from the COF menu, since it is normally disabled from the inventory view.
2010-01-20Merge from viewer2. Minor conflict resolved.Tofu Linden
2010-01-19EXT-4269 PDD: Add teleport destination to teleport warning dialogangela
2010-01-15Fixed low bug EXT-4311 (Order of items in 'Favorites Bar' folder remains ↵Mike Antipov
non-changed if change its order in the 'Favorites Bar') -- reason: there was two places where identical resorting of Favorite landmarks functionality was implemented: InventoryBridge & Favorite bar. It was not impelnmented properly in favorites bar: LLInventoryObserver::SORT flag was not set after d-n-d. -- fix: moved identical functionality to update & save order of Favorite landmarks from these places to Inventory Panel --HG-- branch : product-engine
2010-01-15Fixed normal bug EXT-4312 (Landmark occupy random location in the 'Favorites ↵Mike Antipov
Bar' accordion if drag-and-drop it) -- added LLInventoryCallback to rearrange favorite landmarks properly after new on is added. --HG-- branch : product-engine
2010-01-15Work on normal bug EXT-4312 (Landmark occupy random location in the ↵Mike Antipov
'Favorites Bar' accordion if drag-and-drop it) -- refactoring: move functionality to rearange Favorite landmarks from Inventory Folder bridge to Inventory model -- improved logic to place dragged landmark before target one. --HG-- branch : product-engine
2010-01-14EXT-3955 : [ AppearanceSP ] "Add to Current Outfit" confusing for outfits, ↵Loren Shih
remove it Removed "Add to Current Outfit" from right-click outfits context menu.
2010-01-13Merge.Tofu Linden
2010-01-08automated merge viewer2.0->viewer2.0Loren Shih
2010-01-08EXT-4089 : InventorySP File->Open doesn't open folders.Loren Shih
Includes some minor const correctness infrastructure changes.
2010-01-07mergerichard
2010-01-07For EXT-4030: Can delete the outfit folder that you're wearing in My OutfitsBrad Payne (Vir Linden)
2010-01-06EXT-4014 - Inventory folders should use "open" folder art...richard
reviewed by Leyla
2010-01-04Merge from trunk. Conflicts manually resolved in:Tofu Linden
U indra/llui/lluictrlfactory.cpp U indra/newview/llinventorybridge.cpp U indra/newview/llviewertexture.cpp U indra/newview/llviewertexture.h
2009-12-23For EXT-3622: Take off item, wear a different item --> first item is put on ↵Brad Payne (Vir Linden)
again. Fixed the 'remove all clothing' case.
2009-12-22For EXT-3622: Take off item, wear a different item --> first item is put on ↵Brad Payne (Vir Linden)
again
2009-12-18Merge with viewer-2-0Dave Parks
2009-12-17automated merge viewer2.0->avpLoren Shih
--HG-- branch : avatar-pipeline
2009-12-17EXT-3329 : Able to delete system folder is confusing - disable from non-god modeLoren Shih
"Delete" no longer works for system folders. Created a new "Delete System Folder" context menu entry that only works in RelWithDebug if only one item is selected. --HG-- branch : avatar-pipeline
2009-12-17EXT-2677 : "Remove From Outfit" active even when I'm not wearing any items ↵Loren Shih
in the folder Now checking contents of the folder for any actively worn items for determining this flag. --HG-- branch : avatar-pipeline
2009-12-17Fixed major bug EXT-3498 (Sorting not working correctly in Favorites Bar)Mike Antipov
- added sorting of Favorites items before reordering --HG-- branch : product-engine
2009-12-16EXT-3527 : Centralize calls to getIsItemWornLoren Shih
Changed more functions to use get_is_item_worn. --HG-- branch : avatar-pipeline
2009-12-16EXT-3527 : Centralize calls to getIsItemWornLoren Shih
Changed more functions to use get_is_item_worn. --HG-- branch : avatar-pipeline
2009-12-16EXT-3527 : Centralize calls to getIsItemWornLoren Shih
Moved function from llinventorybridge to llinventoryfunctions. --HG-- branch : avatar-pipeline
2009-12-16EXT-2524 : Disable ability to make links manually in non-god modeLoren Shih
Non-god mode treatment of copy/paste is now consistent with 1.23 behavior, and "paste as linK" doesn't show up in non-god mode. --HG-- branch : avatar-pipeline
2009-12-16EXT-2760 : Double-clicking an Object in inventory opens the permissions in ↵Loren Shih
the side tray Double clicking on an object no longer brings up both the floater and sidetray (it only brings up the sidetray now). --HG-- branch : avatar-pipeline
2009-12-15automated merge avp->avpLoren Shih
--HG-- branch : avatar-pipeline
2009-12-15EXT-3304 : Can't reorder items in the Favorites accordionsLoren Shih
Fixed a bug where addChangedMask(LLInventoryObserver::SORT) was being called before the new sort order was established. --HG-- branch : avatar-pipeline
2009-12-15menu separator fixBrad Payne (Vir Linden)
--HG-- branch : avatar-pipeline
2009-12-15EXT-3304 : Can't reorder items in the Favorites accordionsLoren Shih
EXT-3476 : Dragging and item in the PlacesSP brings up the InventorySP EXT-1916 : Landmarks are not sorted in the Favorites Accordion Added a new LLInventoryObserver::SORT request for resorting folder contents. Landmarks no longer use the same sorting as accordions. --HG-- branch : avatar-pipeline
2009-12-14EXT-3370 integrate tab-ification to appearance sidepanelNyx (Neal Orman)
Moved elements around so that the bottom bar is contained in the outfits panel XUI changes by erica/chuck/nyx code changes by nyx code reviewed by Bigpapi --HG-- branch : avatar-pipeline
2009-12-14Merging in latest viewer 2Palmer Truelson
2009-12-12mergeBrad Payne (Vir Linden)
--HG-- branch : avatar-pipeline
2009-12-11For EXT-3264: Missing separators in inventory context menus - restoreBrad Payne (Vir Linden)
--HG-- branch : avatar-pipeline
2009-12-11automated merge avp->avpLoren Shih
--HG-- branch : avatar-pipeline
2009-12-11Minor gcc compile fixEric M. Tulla (BigPapi)
--HG-- branch : avatar-pipeline
2009-12-11Merge of viewer2 into avp branchEric M. Tulla (BigPapi)
--HG-- branch : avatar-pipeline
2009-12-10For EXT-2858: Determine gear menu / right-click menu choices for AppearanceSPBrad Payne (Vir Linden)
--HG-- branch : avatar-pipeline
2009-12-10Fix for r. click Edit on a link to wearableBrad Payne (Vir Linden)
--HG-- branch : avatar-pipeline
2009-12-10For EXT-2858: Determine gear menu / right-click menu choices for AppearanceSPBrad Payne (Vir Linden)
--HG-- branch : avatar-pipeline
2009-12-10Fix for EXT-3368 - "Save Texture" functionality was no longer respecting permsEric M. Tulla (BigPapi)
2009-12-10For EXT-2858: Determine gear menu / right-click menu choices for AppearanceSPBrad Payne (Vir Linden)
--HG-- branch : avatar-pipeline
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-20 13:07:42 +0000