summaryrefslogtreecommitdiff
path: root/indra/llvfs
AgeCommit message (Expand)Author
2010-01-20Merge from viewer2. Minor conflict resolved.Tofu Linden
2010-01-18EXT-4470 Several bad assumptions that LL_PATH_PER_SL_ACCOUNT is always good (...Tofu Linden
2009-12-18Merge with viewer-2-0Dave Parks
2009-12-14Merge of my old precompiled headers dependency cleanup with tip of viewer-2-0.brad kittenbrink
2009-12-14Merging in latest viewer 2Palmer Truelson
2009-12-09remove LL_PATH_BROWSER_PROFILETofu Linden
2009-12-09rename LL_PATH_MOZILLA_PROFILE to LL_PATH_BROWSER_PROFILETofu Linden
2010-03-01Automated merge with a few fixups for code review commentsRoxie Linden
2010-02-26automated mergeRoxie Linden
2010-02-26automated mergeRoxie Linden
2010-02-25automated mergeRoxie Linden
2009-11-13Refactoring of llviewerprecompiledheaders.h to hopefully increase stabilitybrad kittenbrink
2009-11-11Merged in viewer 2 changes, adjusted xui problems, added mesh folder type and...Palmer
2009-11-06merge from texture-pipelineSteve Bennetts
2009-11-06merge QAR-1829: texture pipeline branch in viewer-2.0.0.3Xiaohong Bao
2009-11-05Produce slightly more info for bad LLDir::setLindenUserDir() callNat Goodspeed
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 from latest svn/viewer-2-0 to hg/viewer-2-0Mark Palange (Mani)
2009-10-16merging in new wearable infrastructure to get a step closer to eventually sup...Neal Orman
2009-10-16DEV-41080 more automated testing love - minor comment fixing.Adam Moss
2009-10-15DEV-41357 resurrect dead lldir test, turn it into an integration test of llvfs.Adam Moss
2009-10-14Merge a big bunch of fixes from maint-viewer. Hooray.Adam Moss
2009-10-01merge of latest lindenlab/svn-imports-viewer-20Mark Palange (Mani)
2009-10-01svn merge -r 134922:134973 svn+ssh://svn.lindenlab.com/svn/linden/branches/me...Monroe Williams
2009-08-31Merge with trunkBryan O'Sullivan
2009-08-29Partial merge of: viewer-2.0.0-3@131138 texture-pipeline-3@131862 -> viewer-2...Steven Bennetts
2009-08-27svn merge -r 129841:129910 svn+ssh://svn.lindenlab.com/svn/linden/branches/mo...Monroe Williams
2009-08-24merge -r 130399-131510 skinning-21 -> viewer-2.0.0-3Richard Nelson
2009-07-15svn merge -r 127173:127174 svn+ssh://svn.lindenlab.com/svn/linden/branches/pl...Monroe Williams
2010-02-01Merge giab-viewer-trunk 2497, general merge of moreRoxie Linden
2009-07-06Merge xui-army-5 to viewer-2, includes layout, art, and color changes, also U...James Cook
2009-07-01svn merge -r125825:125901 svn+ssh://svn.lindenlab.com/svn/user/cg/qar-1654Christian Goetze
2009-06-21merge -r 122421-124917 viewer-2.0.0-2 -> viewer-2.0.0-3Steven Bennetts
2009-05-04QAR-1476 Combo-merge to trunk: Viewer 1.23 RC0 and Simulator 1.26.3Adam Moss
2009-04-16svn merge -r117314:117337Adam Moss
2009-03-20svn merge -r113004:115000 svn+ssh://svn.lindenlab.com/svn/linden/branches/ser...Dave Simmons
2009-02-18Merge of QAR-1267 to trunk. This was a combo merge of QAR-1175 (maint-render...Brad Kittenbrink
2009-02-03QAR-1177 maint-viewer-12 + uploadfees-viewer combo mergemeAdam Moss
2009-01-17svn merge -r108142:108148 svn+ssh://svn.lindenlab.com/svn/linden/qa/maint-ser...Andrew Meadows
2009-01-08Result of svn merge -r107256:107258 svn+ssh://svn/svn/user/phoenix/license_20...Aaron Brashears
2009-01-06QAR-1141 svn merge -r107086:107087 svn+ssh://svn.lindenlab.com/svn/user/cg/ll...Christian Goetze
2008-12-15svn merge -r105329:105903 svn+ssh://svn/svn/linden/branches/featurettes/featu...Melinda Green
2008-12-02QAR-1040 maint-viewer-11 + OpenAL combo mergemeAdam Moss
2008-11-07QAR-992 Merging revisions 101012-101170,101686-101687 of svn+ssh://svn.linden...Mark Palange
2008-10-09QAR-907: svn merge -r 98908:98910 svn+ssh://svn/svn/linden/qa/sim-metrics/sim...Don Kjer
2008-10-07svn merge -r98039:98711 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branc...Kyle Ambroff
2008-09-12QAR-855 Viewer 1.21 RC 2Steven Bennetts
2008-08-29Switch more libraries over to target_link_librariesBryan O'Sullivan
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-30 14:18:39 +0000