summaryrefslogtreecommitdiff
path: root/indra/newview/llinventorybridge.cpp
AgeCommit message (Collapse)Author
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
2009-12-10EXT-3329 : Able to delete system folder is confusing - disable from non-god modeLoren Shih
--HG-- branch : avatar-pipeline
2009-12-09mergeBrad Payne (Vir Linden)
--HG-- branch : avatar-pipeline
2009-12-09For EXT-2858: Determine gear menu / right-click menu choices for AppearanceSPBrad Payne (Vir Linden)
--HG-- branch : avatar-pipeline
2009-12-09fix for linux build breakage, a LLPointer was being implicitly cast wrongNyx (Neal Orman)
approved by Seraph --HG-- branch : avatar-pipeline
2009-12-08Fix of last merge borkasaur. Left off a comma on defining the mesh array. ↵Palmer
Also switched our mesh icon code to sync with viewer 2 and cleared out extra notification
2009-12-08EXT-3133: Viewer crashes after deleting a Trash folder from the My Inventory ↵Loren Shih
accordion Put in a quick fix so that folders can't be made reparented to their own children. --HG-- branch : avatar-pipeline
2009-12-07Merge of viewer 2 changesPalmer
2009-12-07For EXT-2858: Determine gear menu / right-click menu choices for AppearanceSPBrad Payne (Vir Linden)
--HG-- branch : avatar-pipeline
2009-12-04mergeBrad Payne (Vir Linden)
--HG-- branch : avatar-pipeline
2009-12-04For EXT-2845, EXT-2846: standardizing gesture context options to work like ↵Brad Payne (Vir Linden)
wearables and attachments --HG-- branch : avatar-pipeline
2009-12-03EXT-3124 : Add lookup for finding all linked items to an itemLoren Shih
Added ability to filter by UUID. Work in progress. --HG-- branch : avatar-pipeline
2009-12-03merge of viewer2 into avp branchEric M. Tulla (BigPapi)
--HG-- branch : avatar-pipeline
2009-12-02EXT-3057 : Refine the context options that exist for broken linksLoren Shih
EXT-2950 : Trying to waer a link or to "Find Original" of a link silently fails when original is deleted Missing links are now handled correctly in the right-click context menu. --HG-- branch : avatar-pipeline
2009-12-01EXT-3028 : "Find Original" does nothing if floater inventory isn't openLoren Shih
Changed logic for getActiveInventory so that it considers InventorySP. Removed getActiveInventory and replaced with getActiveInventoryPanel since that follows its current usage. This currently contains a bug because the InventorySP always thinks it's open. --HG-- branch : avatar-pipeline
2009-12-01EXT-3029 : Missing icons for broken item link / broken folder linkLoren Shih
EXT-3024 : Broken links don't show up in inventory Mocked up some link icons for broken links. These need to be polished up. Broken links now have an IT_ (instead of being IT_NONE) so that they're filtered correctly and thus can show up in inventory. --HG-- branch : avatar-pipeline