summaryrefslogtreecommitdiff
path: root/indra/llcommon/llassettype.h
AgeCommit message (Expand)Author
2024-08-28Merge branch 'main' into release/luau-scripting.Nat Goodspeed
2024-08-20Add collectDescendentsIf api for LuaMnikolenko Productengine
2024-05-23Merge remote-tracking branch 'origin/project/gltf_development' into brad/merg...Brad Linden
2024-05-20#1392 GLTF Upload (#1394)Dave Parks
2024-04-29#824 Process source files in bulk: replace tabs with spaces, convert CRLF to ...Andrey Lihatskiy
2022-04-28Merge remote-tracking branch 'origin/euclid-17277' into brad/SL-17116-materia...Brad Kittenbrink
2022-04-28Beginning viewer side work for SL-17198 new asset and inventory types for Mat...Brad Kittenbrink
2022-04-28Add a (broken) material upload handler fxnDave Houlton
2018-09-26MergeRider Linden
2018-08-01MAINT-8803 Better UI handling of unrecognized inventory itemsmaxim_productengine
2018-02-26Added settings inventory object with subtypeRider Linden
2017-09-19Baseline for settings changesRider Linden
2017-03-20MAINT-7195 work (can't repro), removed UDP fetching path, handle more possibl...Brad Payne (Vir Linden)
2017-02-14SL-409 - debug setting to enable/disable use of ViewerAsset cap by asset type...Brad Payne (Vir Linden)
2015-11-10remove execute permission from many files that should not have itOz Linden
2015-01-02DD-297 : Performance on login : Refactored the code so that we have a new LLM...Merov Linden
2013-07-30Summer cleaning - removed a lot of llcommon dependencies to speed up build timesRichard Linden
2013-03-29Update Mac and Windows breakpad builds to latestGraham Madarasz
2012-06-08CHUI-120 WIP Added conversations participants drag and drop from avatar lists...Seth ProductEngine
2011-10-03EXP-1286 : First pass at Drag and Drop of tools. Not functional. Most hooks i...Merov Linden
2010-10-13correct licenses (fix problem with license change merge)Oz Linden
2010-06-14Builds with LLConvexDecompInter as a static lib.Dave Parks
2010-06-10Add "LL_MESH_ENABLED" preprocessor flag for toggling mesh code. Couple of me...Dave Parks
2010-04-01merge from viewer-trunkTofu Linden
2010-04-01BOOL->bool on llassettype.*Tofu Linden
2010-04-01another hairy merge from viewer-trunkTofu Linden
2010-03-31EXT-5581 : Centralize is_asset_fetch/knowlable into asset dictionaryLoren Shih
2009-11-17Automated merge with ssh://palmer@hg.lindenlab.com/viewer/viewer-2-0Palmer
2009-11-13EXT-2482 : Newly created folders have wrong default typeLoren Shih
2009-11-11Merged in viewer 2 changes, adjusted xui problems, added mesh folder type and...Palmer
2009-11-04Redo Bao's broken mergeBryan O'Sullivan
2009-11-03mergeLoren Shih
2009-11-02Merge of viewer-2-0 changesPalmer
2009-11-02Sync up with render-pipeline-7 ignore-dead-branchDavid Parks
2009-09-18Merged latest viewer/viewer-20 into login-api.brad kittenbrink
2009-08-31Merge with trunkBryan O'Sullivan
2009-08-13Merged latest viewer-2.0.0-3 change up through svn r130333 into login-api.brad kittenbrink
2009-08-12svn merge -r129617:130277 svn+ssh://svn.lindenlab.com/svn/linden/branches/ava...Loren Shih
2009-07-30Merged in viewer-2.0.0-3 changes up through r129050. Boost got clobbered so ...brad kittenbrink
2009-07-24For QAR-1710 : Server merge for QAR-1594 QAR-1643 QAR-1644 - "AVP Changes [SIM]"Loren Shih
2009-07-23svn merge -r 127683:128178 svn+ssh://svn.lindenlab.com/svn/linden/branches/av...Loren Shih
2009-07-01Fixups for windows llcommon dll linkage errors that got dropped in the merge ...brad kittenbrink
2009-06-24merge -r125267:125272 svn+ssh://svn.lindenlab.com/svn/linden/branches/avatar-...Loren Shih
2009-06-21merge -r 122421-124917 viewer-2.0.0-2 -> viewer-2.0.0-3Steven Bennetts
2009-01-08Result of svn merge -r107256:107258 svn+ssh://svn/svn/user/phoenix/license_20...Aaron Brashears
2008-06-26QAR-628 merge string-cleanup-5 -r 90476:90508 -> releaseSteven Bennetts
2007-10-04Result of svn merge -r71162:71205 svn+ssh://svn/svn/linden/branches/new-licen...Aaron Brashears
2007-03-15svn merge -r 58433:58660 svn+ssh://svn/svn/linden/branches/upload-queue into ...Don Kjer
2007-01-31merge release@57486 release-candidate@57503Steven Bennetts
2007-01-02Print done when done.James Cook