summaryrefslogtreecommitdiff
path: root/indra/newview/llviewerinventory.h
AgeCommit message (Collapse)Author
2016-05-20Merged in lindenlab/viewer-releaseAndreyL ProductEngine
2016-03-31Needs prototype.Aura Linden
2016-03-31Faster to copy changes than merge branches.Aura Linden
2015-11-10remove execute permission from many files that should not have itOz Linden
2014-12-19Pull merge from lindenlab/viewer-releaseMerov Linden
2014-10-23MAINT-4196 WIP, including clearer inventory warnings for attachment errorsBrad Payne (Vir Linden)
2014-07-22Sync merge with lindenlab/viewer-releaseMerov Linden
2014-06-16merge changes for 3.7.9-releaseOz Linden
2014-05-30DD-92 : pull merge lindenlab/sunshine-external to get AISv3 workMerov Linden
2014-05-30Pull merge from lindenlab/viewer-releaseMerov Linden
2014-05-13sunshine-external merge WIPBrad Payne (Vir Linden)
2014-05-07merge changes for 3.7.7-releaseOz Linden
2014-04-14DD-20 : Prevent pasting incompatible items in stock foldersMerov Linden
2013-11-20STORM-68 Reapply changes to inventory processing lost in the merge.Jonathan Yap
Move call to updateCap back to where it was. The place it was moved to was too early in the login sequence and was causing a crash.
2013-11-18SH-4578 WIP - cleaner folder version accountingBrad Payne (Vir Linden)
2013-08-16mergeNyx Linden
2013-08-16merge with viewer-releaseNyx Linden
2013-08-14SH-4422 FIX - fixed some recently introduced issues with link description ↵Brad Payne (Vir Linden)
fields, which among other things reduces the number of appearance requests sent.
2013-08-09Refactoring link creation calls in preparation for adding AIS v3 hook.Don Kjer
2013-07-30Summer cleaning - removed a lot of llcommon dependencies to speed up build timesRichard Linden
consolidated most indra-specific constants in llcommon under indra_constants.h fixed issues with operations on mixed unit types (implicit and explicit) made LL_INFOS() style macros variadic in order to subsume other logging methods such as ll_infos added optional tag output to error recorders
2013-07-19SH-3889 WIP - added callbacks to control ordering of operations after ↵Brad Payne (Vir Linden)
wearable save.
2013-07-11Adding support for COPY methods to httpclient. Implementing viewer-side use ↵Don Kjer
of AISv3 COPY library folder operation. (SH-4304)
2013-06-24SH-4243 WIP - cleaned up callback structure for createNewCategory, modified ↵Brad Payne (Vir Linden)
makeNewOutfitLinks() to wait for category creation before populating.
2013-06-10SH-4216 WIP - finished item/cat update and reorg of aisv3 codeBrad Payne (Vir Linden)
2013-06-03SH-4166 WIP - COF-slammer infrastructure working for non-AIS case.Brad Payne (Vir Linden)
2013-05-24SH-4027 WIP - initial implementation of item update via AIS.Brad Payne (Vir Linden)
2013-05-01Merge vwr-dev-matGraham Madarasz
2013-04-30Merge 3.5.1 into MaterialsGraham Madarasz
2013-04-25SH-4137 WIP - added callback-based support for purge descendents, remove ↵Brad Payne (Vir Linden)
category
2013-04-23SH-4128 WIP - rewiring various link-deleting operations to support callbacksBrad Payne (Vir Linden)
2013-04-19merge changes for DRTVWR-294Oz Linden
2013-04-18SH-4128 WIP - use the AISv3 inventory cap when available for cof link ↵Brad Payne (Vir Linden)
deletion, hook in to callback mechanism so all link operations should be done before outfit is worn.
2013-03-29Update Mac and Windows breakpad builds to latestGraham Madarasz
2013-03-11mergeprep
2013-03-11mergeprep
2013-03-11Viewer-chui mergeprep
2013-02-27Automated merge with https://bitbucket.org/lindenlab/sunshine-internalRichard Linden
2013-02-25SH-3860 WIP, SH-3899 WIP - make folder version management more debuggable, ↵Brad Payne (Vir Linden)
log appearance request results
2013-01-15Fixed spelling error.Logan Dethrow
2012-12-10SH-3606 WIP - fixed bug found by persnickety compilerBrad Payne (Vir Linden)
2012-12-10SH-3606 WIP - replaced several LLInventoryCallback subclasses with ↵Brad Payne (Vir Linden)
boost::func equivalents
2012-12-07SH-3606 WIP - moving classes to more reusable locationBrad Payne (Vir Linden)
2012-06-21CHUI-101 WIP Make LLFolderview general purposeRichard Linden
inventory item labels and icons displaying again
2012-06-15CHUI-101 WIP Make LLFolderView general purposeRichard Linden
llfolderview refactornig
2011-11-04EXP-1541 update -- Route inventory items sent in a Notecard to correct ↵Leslie Linden
locations rather than auto-sorting by asset type * New code specifies explicit destination for "copy from notecard" or null, indicating the sim should determine the placement. Reviewed by Stone.
2010-12-09STORM-34 ADDITIONAL_FIX Implemented storing of multi-user favorites and ↵Andrew Productengine
showing them on login screen. - Changed the way SLURLs are cached a little, because previous one introduced problems with theit order. - Also allowed saving of favorites to disk even if not all of them received SLURL info - this is done to avoid favorites not saving when there is at least one "dead" landmark among them. - "Username" field on login screen is now not a lineeditor, but combobox (to enable autocompletion), but without button (Esbee asked for this in ticket for security reasons, and perhaps for visual consistency). - Elements of this combobox are names of users whose favorites we have saved in file. - Contents of "Start at:" combobox are changed depending on changes in "Username"- if username is present in favorites file, favorites for this user are added there. - New callback was added to LLCombobox and used in this fix, because present ones weren't enough to easily track changes in text entry.
2010-09-03Post-convert merge by convert_monolith.py from ↵Aimee Linden
/Users/Aimee/Documents/Work/Linden-Lab/Development/viewer/convert/viewer-identity-evolution
2010-08-13Change license from GPL to LGPL (version 2.1)Oz Linden
2010-08-04Merge with dessie/viewer-releaseLeyla Farazha
2010-08-02Redo the same merge as in changeset "2026f824953f", but this time with ↵Christian Goetze (CG)
feeeeling.