summaryrefslogtreecommitdiff
path: root/indra/llcommon/llassettype.cpp
AgeCommit message (Expand)Author
2018-11-22SL-10116 Allow to copy asset IDs for settings with appropriate perms.maxim_productengine
2018-09-26MergeRider Linden
2018-09-19SL-9672 [EEP] Right-click "Copy Asset UUID" should be inactivemaxim_productengine
2018-08-01MAINT-8803 Better UI handling of unrecognized inventory itemsmaxim_productengine
2018-06-08Settings inventory picker.Rider Linden
2017-09-19Baseline for settings changesRider Linden
2016-09-15MAINT-5232: Normalize LLSingleton subclasses.Nat Goodspeed
2015-11-10remove execute permission from many files that should not have itOz 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-07-13Fix for mesh upload, consolidate generating bad indices, and normal generation.Dave Parks
2010-06-10Add "LL_MESH_ENABLED" preprocessor flag for toggling mesh code. Couple of me...Dave Parks
2010-04-28merge from viewer-trunkTofu Linden
2010-04-27EXT-7076 : Allow "paste as link" for any itemLoren Shih
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-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-02Merge of viewer-2-0 changesPalmer
2009-11-02Sync up with render-pipeline-7 ignore-dead-branchDavid Parks
2009-10-19mergeSteve Bennetts
2009-10-16Merge of latest avatar pipeline working branch into viewer2.0 branch.Eric Tulla
2009-09-14Merge with SVN viewer-2.0.0-3 branchBryan O'Sullivan
2009-09-10For DEV-34223: Avatar Pipeline Project - M6 (Current Outfit Folder, Appearanc...Bradley Payne
2009-08-31Fix up some post-merge breakage.Bryan O'Sullivan
2009-08-31Merge with trunkBryan O'Sullivan
2009-08-18svn merge -r130469:130817 svn+ssh://svn.lindenlab.com/svn/linden/branches/ava...Loren Shih
2009-08-12svn merge -r129617:130277 svn+ssh://svn.lindenlab.com/svn/linden/branches/ava...Loren Shih
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-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-07-31svn merge -r93014:93396 svn+ssh://svn.lindenlab.com/svn/linden/branches/mono-...Dave Hiller
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-10-04Result of svn merge -r70873:71086 svn+ssh://svn/svn/linden/branches/enable-ex...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