summaryrefslogtreecommitdiff
path: root/indra/newview/llinventorybridge.h
AgeCommit message (Collapse)Author
2010-04-06another hairy merge from viewer-trunk :(Tofu Linden
2010-04-02EXT-6689 : INFRASTRUCTURE : LLInventoryBridge code cleanupLoren Shih
Moved a bunch of local llinventorybridge functions into .cpp. Did a bunch of superficial cleanup of llinventorybridge and related files.
2010-04-01EXT-6679 : INFRASTRUCTURE : Have LLInvFVBridge contain a LLFolderView *mRoot ↵Loren Shih
instead of passing it along everywhere such as in performAction mRoot is now stored for all LLInventoryBridge types. Did some superficial formatting cleanup for LLInventoryBridge.
2010-04-01EXT-4084 : Change LLInventoryBridge "LLFolderView* folder" to "LLFolderView ↵Loren Shih
*rootFolder" Superficial cleanup - changed all instances to "LLFolderView* root".
2010-02-05merge from viewer2 trunk.Tofu Linden
2010-02-04EXT-4993 : Deleting an item from the COF in Inventory Floater keeps it wornLoren Shih
EXT-4997 : Centralize right-click menu options for delete/remove link EXT-4998 : Automatically reject double separators from right click menu Disabled/hid delete button from COF right-click menu, also means that trash icon is disabled. Added generalized function to remove consecutive separators from right-click menu. Made a minor cosmetic change to have all code duplication for adding "delete" menu item instead call a common function.
2010-02-04EXT-4990 : "Find Original" should be enabled for links in the trashLoren Shih
EXT-4988 : Centralize right-click menu options when items are in trash This change is a lot less scary than it looks. There is a bit of minor cosmetic cleanup (e.g. typedefing a commonly-used vector), and I've eliminated code duplication since, previously, every item/listener type had its own purge/restore item dialog; these are now handled in one central function. I also moved "Find Original" above Purge/RestoreItem so that it appears first in the trash menu; this does not affect other menu options. The functionality change from this checkin is to enable "Find Original" for link items in the trash.
2010-02-04EXT-4801 : hitting trash button for trashed items does not delete itemLoren Shih
EXT-4957 : add const correctness for LLFolderViewEventListener::isItemRemovable This checkin affects several files but is a lot less scary than it looks. It's mostly to add const correctness, and to rename isInTrash to isItemInTrash so that its naming is consistent with isItemRemovable/isItemMovable. The only functionality change is to disable the trash button when an item is already in the trash.
2010-02-03merge from viewer2.Tofu Linden
2010-02-01Fixed normal bug EXT-4768 - 'Play' btn does nothing to gesture in Inventory ↵Dmitry Zaporozhan
side panel. --HG-- branch : product-engine
2010-01-28Merge from viewer2 trunk.Tofu Linden
2010-01-27CID-386Tofu Linden
Checker: UNINIT_CTOR Function: LLFolderBridge::LLFolderBridge(LLInventoryPanel *, const LLUUID &) File: /indra/newview/llinventorybridge.h
2010-01-22Merge from v2 trunk.Tofu Linden
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-13Merge.Tofu 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-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-14Merging in latest viewer 2Palmer Truelson
2009-12-11Merge of viewer2 into avp branchEric M. Tulla (BigPapi)
--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-07Merge of viewer 2 changesPalmer
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-11-25Merge of viewer 2Palmer Truelson
2009-11-20EXT-2456 : Usability: Inventory > Clothing > context menu not intuitiveLoren Shih
Context menu now fills in after folder contents are fetched. --HG-- branch : avatar-pipeline
2009-11-19EXT-2668 : Screwy logic for figuring out if a folder is removableLoren Shih
EXT-2661 : "Remove From Outfit" on COF doesn't take off my outfit EXT-2662 : Can't delete a worn item link Cleaned up the whole "isItemRemovable" logic, and having folders figure this out recursively via children. Changed the isItemRemovable logic so that links aren't treated as worn for the purposes of deletion. --HG-- branch : avatar-pipeline
2009-11-18EXT-2581 : Old items still display as "(worn)" even after I change outfitsLoren Shih
Added gInventory.notifyObservers to idle callbacks so it gets triggered without explicit notifyObservers synchronization. Added more state tracking for attachments, wearables, and links of those types, so that they're marked as changed properly.
2009-11-17Automated merge with ssh://palmer@hg.lindenlab.com/viewer/viewer-2-0Palmer
2009-12-01EXT-2117 - Fix for not being able to add / remove multiple items of ↵Eric M. Tulla (BigPapi)
different types from your inventory
2009-11-13Header file cleanupLoren Shih
Moved LLInventoryPanelObserver to be private to LLInventoryPanel --HG-- branch : avatar-pipeline
2009-11-13Header file cleanupLoren Shih
Removed unnecessary "#include llinventorymodel.h" now that llinventoryobserver was split from llinventorymodel. --HG-- branch : avatar-pipeline
2009-11-11Merged in viewer 2 changes, adjusted xui problems, added mesh folder type ↵Palmer
and more mesh inventory type info
2009-11-06mergeLoren Shih
--HG-- branch : avatar-pipeline
2009-11-06EXT-2278 : "Save Texture As" for bottom panelLoren Shih
EXT-2310 : "Save Texture As" for inventory right-click menu "Save Texture As" now works properly and brings up the texture preview while saving. Also added "Save Texture As" to the right-click inventory context menu. --HG-- branch : avatar-pipeline
2009-11-04Redo Bao's broken mergeBryan O'Sullivan
2009-11-02EXT-1866 : Inventory Side PanelLoren Shih
svn merge -r137106:137808 svn+ssh://svn.lindenlab.com/svn/linden/branches/avatar-pipeline/inventory-panel Porting over changes from svn Inventory Panel work.
2009-11-02Sync up with render-pipeline-7 ignore-dead-branchDavid Parks
2009-10-21Merging revisions 2112-2128 of ↵Steven Bennetts
https://svn.aws.productengine.com/secondlife/pe/stable-2 into P:\svn\viewer-2.0.0, respecting ancestry * Bugs: EXT-1605 EXT-1506 EXT-1663 EXT-1616 EXT-1599 EXT-1587 * Dev: EXT-748 EXT-1447 * IM Cleanup
2009-10-19Merging revisions 2046-2068 of ↵Steven Bennetts
https://svn.aws.productengine.com/secondlife/pe/stable-2 into P:\svn\viewer-2.0.0, respecting ancestry * Bugs: EXT-1414 EXT-1213 EXT-1539 EXT-1253 EXT-1446 EXT-1438 EXT-1233 EXT-1466 EXT-1446 EXT-1512 EXT-1231 * Dev: EXT-719 (landmarks) EXT-747 EXT-1446 EXT-1378 EXT-397 EXT-1476 * IM changes
2009-09-10For DEV-34223: Avatar Pipeline Project - M6 (Current Outfit Folder, ↵Bradley Payne
Appearance Side Panel) - brought merge branch changes from avatar-pipeline/viewer-2.0.0-3_cwf-7_merge into viewer-2.0.0-3. svn merge -r132878:132947 svn+ssh://svn.lindenlab.com/svn/linden/branches/avatar-pipeline/viewer-2.0.0-3_cwf-7_merge
2009-08-28svn merge -r 1490-1500 https://svn.aws.productengine.com/secondlife/pe/stable-2Steven Bennetts
Bug Fixes: * EXT-637 EXT-595 Dev work: * EXT-694 QA: * Be sure feature works on other locales Known issues: * If old Calling Card of person who presents in the friend list is removed - "Do you want to remove ..." dialog is shown, if old Calling Card of non-friend is removed it is removed in the old way without any alerts. * It is possible to create 2 deep level subfolders under the Calling Cards/Friends/ subfolders. This should be disabled due to Accordion does not support tree hierarchy. * If friendship is removed when agent is offline, Friend Card is not removed from Inventory.
2009-08-18svn merge -r130469:130817 ↵Loren Shih
svn+ssh://svn.lindenlab.com/svn/linden/branches/avatar-pipeline/currently-worn-folder-6 into svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer-2.0.0-3 This merges in all appearance side panel bug fixes.
2009-08-12svn merge -r129617:130277 ↵Loren Shih
svn+ssh://svn.lindenlab.com/svn/linden/branches/avatar-pipeline/currently-worn-folder-5 into svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer-2.0.0-3 For DEV-34223 : AVP Current Outfit Folder For DEV-37485 : AVP Appearance Side Panel For DEV-35335 : AVP Automatic Folder Classification This merges the Appearance Side Panel / Ensemble Typing / Current Outfit Folder work for the AVP team.
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-26 10:00:13 +0000