summaryrefslogtreecommitdiff
path: root/indra/newview/llfolderviewitem.cpp
AgeCommit message (Collapse)Author
2009-12-17automated merge viewer2.0->avpLoren Shih
--HG-- branch : avatar-pipeline
2009-12-17EXT-1634 : Block collapse/expand of accordion "root" folder by keywordLoren Shih
Hidden folders are no longer allowed to be selected. --HG-- branch : avatar-pipeline
2009-12-17EXT-2636: we now show "Loading..." before the my inventory named folder when ↵Eric M. Tulla (BigPapi)
doing a background fetch.
2009-12-11automated merge avp->avpLoren Shih
--HG-- branch : avatar-pipeline
2009-12-11EXT-3373 : Favorites folder disappears after canceling filterLoren Shih
Doing a more robust check to see if folders need to be refreshed. --HG-- branch : avatar-pipeline
2009-12-10Fix for EXT-3368 - "Save Texture" functionality was no longer respecting permsEric M. Tulla (BigPapi)
2009-12-08ext-2049 - tighten up inventory indentationsrichard
2009-12-07EXT-3159 Mouse-wheel scrolling down causes unexpected side-scrollingJames Cook
If vertical scroll bar is visible, give it the scroll events and don't scroll horizontally. Eliminated extraneous folder view item scroll handler. Reviewed with Richard.
2009-11-24mergeLoren Shih
--HG-- branch : avatar-pipeline
2009-11-23EXT-2763 : Right-click on inventory doesn't bring up context menuLoren Shih
Also did some minor cleanup on header files. --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-1916 : Places: Landmarks are not sorted in the Favorites Bar AccordionLoren Shih
2009-11-17Fix for avp->hg incorrect merge.Loren Shih
2009-11-17EXT-2583 : Some sidepanel inventory folders appear blankLoren Shih
Starting sidepanel inventory folders as open by default. Also did some minor syntactic cleanup on the folder filter iterators. --HG-- branch : avatar-pipeline
2009-11-16EXT-2526 : Disable "double click to wear" on outfit foldersLoren Shih
EXT-1763 : Places - Landmarks : Unable to drop a landmark into Landamrks & FavoriteBar accordian panels Threefixes in here. (1) Simple disable of double-click. (2) Corrected typos "hierary"-> "hierarchy". (3) Now adding start folder to specialized inventory panels, so that we get the start folder's listener for drag&drop operations. --HG-- branch : avatar-pipeline
2009-11-13Merging viewer2 changes into avp branchEric M. Tulla (BigPapi)
--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-11EXT-2049 - tighten up indentations on inventoryrichard
2009-11-04Redo Bao's broken mergeBryan O'Sullivan
2009-10-21mergeSteve Bennetts
2009-10-21selected inventory item no longer renders double boxRichard Nelson
reviewed by James
2009-10-19mergeSteve Bennetts
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-10-16mergeMark Palange (Mani)
2009-10-15EXT-1279 Crash if font file not found.Steve Bennetts
Added getFontDefault() to llfontgl.h --HG-- branch : branch-test
2009-10-13fix an inventory window rendering quality issue introduced in the ↵Adam Moss
avatar-pipeline/currently-worn-folder-10 - it was drawing each inventory window row twice superimposed.
2009-10-12Merging avatar-pipeline/currently-worn-folder-10 down to viewer-2.Bradley Payne
svn merge -r 134766:135946 svn+ssh://svn.lindenlab.com/svn/linden/branches/avatar-pipeline/currently-worn-folder-10 .
2009-10-10EXT-1400 New 'name popup' lets you do things (IM, TP etc) to your own avatarLeyla Farazha
EXT-1021 Update code to use new Inventory Icon art files in floater_invetory.xml EXT-176 Open and closed state for art for folders in list view in side panel
2009-10-04EXT-1224 Inventory list uses ugly fake-italicsAdam Moss
Reviewed by Richard.
2009-10-03Merge inspectors UI project, gooey-4, into viewer-2 trunk. Added new ↵James Cook
tooltips to 3D avatars, 2D avatar names, and 3D objects. Refactors tooltips and text boxes, line editors, and text editors. Breaks LLExpandableTextBox, but a fix is coming. Resolved conflicts in lltexteditor.cpp, llchatitemscontainerctrl.cpp, llchatmsgbox.cpp, llfloaterbuycurrency.cpp, llnearbychat.cpp, floater_buy_currency.xml, and ru/strings.xml Merging revisions 134925-135157 of svn+ssh://svn.lindenlab.com/svn/linden/branches/gooey/gooey-4 into C:\source\viewer-2.0.0-3, respecting ancestry
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-24merge -r 130399-131510 skinning-21 -> viewer-2.0.0-3Richard Nelson
DEV-11254 DEV-11254 DEV-2003: DEV-21567 DEV-37301 EXT-104 EXT-138 EXT-217 EXT-256 EXT-259 EXT-259 EXT-328 EXT-348 EXT-386 EXT-399 EXT-403 EXT-460 EXT-492 EXT-492 EXT-531 EXT-537 EXT-684 improved text editor (handles multiple fonts simultaneously as well as inline widgets)
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.
2009-07-27Merged skinning-17 into viewer-2 for bug fixes. Commented out new IM window ↵James Cook
for now, not complete. Merging revisions 127913-128319 of svn+ssh://svn.lindenlab.com/svn/linden/branches/skinning/skinning-17 into D:\viewer-2.0.0-3, respecting ancestry
2009-07-23svn merge -r 127683:128178 ↵Loren Shih
svn+ssh://svn.lindenlab.com/svn/linden/branches/avatar-pipeline/folder-links__merge__viewer-2.0.0.3-r127634 into svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer-2.0.0-3 For DEV-36425 : Viewer merge for Folder Links and Types [VIEWER] Test plans - EXTERNAL * [ Test against a 1.30 server ] * Test various inventory operations -- move, copy, paste-as-link, etc. on both folders and inventory items. * Test ability to change user-created folder types. Test inventory operations on these folder types. Test plans - INTERNAL * Test against any inventory smoke tests. * See test plan in QAR-1643 for full FolderLinks&Types test plan.
2009-07-07Merge skinning-14 to viewer-2, including refactoring many floaters to ↵James Cook
register them with LLFloaterReg, support for introspection of ParamBlock based UI widgets to dump XML schema, splitting llfolderview.cpp into three separate files to unravel dependencies and skeleton for for LLListView widget. Resolved conflicts in these files: lldraghandle.h, lluictrl.h, llchiclet.cpp, llfolderview.h/cpp, lliinventorybridge.cpp, llpanelpicks.cpp, llviewermenu.cpp, floater_mute.xml, floater_preferences.xml, notifications.xml, panel_preferences_audio.xml, panel_preferences_graphics1.xml, panel_region_general.xml svn merge -r124961:126284 svn+ssh://svn.lindenlab.com/svn/linden/branches/skinning/skinning-14