summaryrefslogtreecommitdiff
path: root/indra/newview/llfolderview.h
AgeCommit message (Collapse)Author
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-13merge from viewer-releaseTofu Linden
2010-08-13Change license from GPL to LGPL (version 2.1)Oz Linden
2010-08-12EXT-8473 FIXED Fixed renaming inventory items without hitting Enter.Vadim Savchuk
Problem: The bug was caused by the fix of EXT-6682 that prematurely forgets the item being renamed (by resetting mRenameItem) whenever the renamer input field loses focus. That's why we couldn't actually finish renaming item. Fix: The code is quite messy, but I'll try to explain. There are three cases when we should hide the renamer: 1) ESC key is hit (just hide). 2) ENTER key is hit (rename, then hide). 3) renamer loses focus (rename, then hide). In the first two cases we manually remove the renamer from the popups list -- by calling gViewerWindow->removePopup(mRenamer). In the third case that's done automatically. So, in all cases the onRenamerLost() pop-up is called that hides the renamer and only *then* resets mRenameItem. Not only this approach fixes the bug -- I hope it's a bit more straightforward too. Reviewed by Seraph at https://codereview.productengine.com/secondlife/r/854/ --HG-- branch : product-engine
2010-08-10EXT-8255 FIXED Added confirmation dialog when removing items.Andrew Dyukov
Reviewed by Vadim Savchuk at https://codereview.productengine.com/secondlife/r/849/ --HG-- branch : product-engine
2010-08-04Backed out changeset: b81927151a18. Fix of EXT-3981 reverted to fix EXT-4379.Sergei Litovchuk
--HG-- branch : product-engine
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-07-27Backed out changeset: 58571b4e704bRichard Linden
2010-07-27automated mergeLoren Shih
2010-07-26EXT-8229 FIXED Add "--no options--" automatically instead of special casing ↵Loren Shih
for it in right-click menus Changed logic so that the menu is post-processed and, at that time, nooptions is added if the menu is seen to be empty.
2010-07-22EXT-5403 FIXED texture picker to scroll to selected texture initially after ↵Sergei Litovchuk
being open. Reviewed by Mike Antipov at https://codereview.productengine.com/secondlife/r/736/. --HG-- branch : product-engine
2010-07-15Reverted changeset 2bb10eae42bfDessie Linden
2010-07-12EXT-5403 FIXED Disabled auto selecting first filtered item because it takes ↵Sergei Litovchuk
away selection from the item set by LLTextureCtrl owning the texture picker floater. Reviewed by Vadim Savchuk at https://codereview.productengine.com/secondlife/r/679/. --HG-- branch : product-engine
2010-06-10EXT-7750 - Wearing list does not need to be bold or show link or wornRichard Linden
2010-05-13EXT-4088 : FIXED : INFRASTRUCTURE : Change LLFolderView::getSelectionList to ↵Loren Shih
return a selection Function signature change to return a selection instead of taking one as an argument.
2010-05-05Fixed normal bug EXT-6757 (The whole My inventory area becomes selected if ↵Mike Antipov
an object has been drug&dropped from Trash folder) Reason: LLFoldefView has set ShowSelectionContext attribute when drag is started. And selected item is shown with filled selection after item is dropped until mouse is over inventory panel. In case of drag from Trash that item removes from inventory and selected item is the whole My Inventory folder. So, it is shown with filled selection. To fix this bug it is necessary to call setShowSelectionContext(FALSE); Implemented in LLFolderView::onMouseLive() handler. Reviewed by Richard Nelson at https://codereview.productengine.com/secondlife/r/275/ --HG-- branch : product-engine
2010-04-19Fixed major bug EXT-6682 (Emptying Lost & Found Folder can crash Viewer2.0 ↵Mike Antipov
if recent item was added) Reason: a pointer to renamed item was not nullified in Folder View when rename control lost focus. Fix: updated focus lost callback to nullify the pointer to renamed item. Had to made this callback non-static to have access to Folder View's member pointer. Also made "New..." menu items disabled for Lost & Found folder. Reviewed by Tofu Linden at https://codereview.productengine.com/secondlife/r/251/ --HG-- branch : product-engine
2010-03-16fix for normal EXT-6354 [HARD CODED] - Inventory, Filter-popup: Title isnґt ↵Yuri Chebotarev
localized reviwed https://codereview.productengine.com/secondlife/r/35/ --HG-- branch : product-engine
2010-03-02Fixed major bug EXT-3981 ([BSI] scroll bar resets to near the top of ↵Mike Antipov
inventory search) - disabled auto scrolling in inventory panels when mouse pointer is over the panel --HG-- branch : product-engine
2010-02-11EXT-4837 [NUX] When filter results in null state, provide a message ↵angela
suggesting the user try global search.
2010-01-28working on normal EXT-4261 Cannot use Keyboard to navigate to search result ↵Ychebotarev ProductEngine
in my landmarks tab --HG-- branch : product-engine
2010-01-08EXT-4089 : InventorySP File->Open doesn't open folders.Loren Shih
Includes some minor const correctness infrastructure changes.
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-09EXT-3274 : Landmarks or Favorites accordion panel shows up as emptyLoren Shih
EXT-1609 : Strange behavior for accordions in Places panel, Landmarks tab Forcing top-level folders open when accordion is active. Removed logic that was saving and restoring initial folder state. --HG-- branch : avatar-pipeline
2009-12-04merge to pull viewer-2 changes into avpNyx (Neal Orman)
--HG-- branch : avatar-pipeline
2009-12-04EXT-3124 : Add lookup for finding all linked items to an itemLoren Shih
Filter now works correctly. Made some naming changes (e.g. setFilterType -> setFilterObjectType) so that what you choose to filter by is more explicit. --HG-- branch : avatar-pipeline
2009-12-03EXT-3125 : INFRASTRUCTURE : Cleanup LLInventoryFilter to disambiguate ↵Loren Shih
various filter options EXT-3124 : Add lookup for finding all linked items to an item LLInventoryFilter cleanup, including adding ability to lookup item by UUID. --HG-- branch : avatar-pipeline
2009-12-03EXT-2954 Crash when using the mousewheel in any inventory panelJames Cook
LLFolderView was explicitly passing scroll events back to its parent LLScrollContainer, which it didn't need to do. It may not have exhibited an infinite loop before due to bugs in the border width computations for scroll rectangles. Reviewed with Leyla.
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-04Redo Bao's broken mergeBryan O'Sullivan
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-16Merge of latest avatar pipeline working branch into viewer2.0 branch.Eric Tulla
Result of: (NO CONFLICTS) svn merge -r 135985:136503 svn+ssh://svn.lindenlab.com/svn/linden/branches/avatar-pipeline/currently-worn-folder-11 .
2009-09-30converted focus change callbacks to use signalsRichard Nelson
replaced mFocusChangedSignal that PE added with our hierarchical focus mgmt reviewed by Leyla
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-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-10merge QAR-1579: texture-cleanup-1.Xiaohong Bao
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
2009-06-24merge -r125267:125272 ↵Loren Shih
svn+ssh://svn.lindenlab.com/svn/linden/branches/avatar-pipeline/inventory-links__merge__viewer2.0.0-3-r125202 to svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer-2.0.0-3
2009-06-22QAR-1383: convert new uses of Boost.Signals (arriving from other branches) toNat Goodspeed
Boost.Signals2 like the rest of the event-system-n code.
2009-06-21merge -r 124105-124625 skinning-13 -> viewer-2.0.0-3Steven Bennetts
2009-06-21merge -r 122421-124917 viewer-2.0.0-2 -> viewer-2.0.0-3Steven Bennetts
ignore-dead-branch
2009-04-16svn merge -r117314:117337Adam Moss
svn+ssh://svn.lindenlab.com/svn/linden/branches/moss/mv13a-merge-1 QAR-1343 maint-viewer-13a+libcurlexploitfix-3-3 combo merge
2009-01-08Result of svn merge -r107256:107258 ↵Aaron Brashears
svn+ssh://svn/svn/user/phoenix/license_2009_merge into trunk. QAR-1165
2008-09-29QAR-872 Viewer 1.21 RC 3Steven Bennetts
merge viewer_1-21 96116-97380 -> release
2008-08-12QAR-767 Combined maint-render-7 and maint-viewer-9 mergeSteven Bennetts
merge release@93398 viewer-merge-1@94007 -> release dataserver-is-deprecated
2008-06-26QAR-628 merge string-cleanup-5 -r 90476:90508 -> releaseSteven Bennetts
dataserver-is-deprecated
2008-06-06QAR-650 - Viewer RC 9 merge -> release (post cmake)Steven Bennetts
merge release@88802 Branch_1-20-Viewer-2-merge-1@89178 -> release
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-11 23:35:11 +0000