summaryrefslogtreecommitdiff
path: root/indra/llxml
AgeCommit message (Expand)Author
2012-11-20Automated merge with https://bitbucket.org/lindenlab/viewer-developmentDave Parks
2012-10-02Fixed LLControlGroup::get() template to not crash on missing items. Reviewedsimon@Simon-PC.lindenlab.com
2012-10-11Make LLTransUtil::parseStrings() merge all relevant strings.xml files.Nat Goodspeed
2012-05-24EXP-1942,EXP-1945: Altering behavior when setting maturity preference to chec...Todd Stinson
2012-02-06EXP-1849 FIXED Privacy settings could be set to default when modifying other ...Vadim ProductEngine
2012-02-01converted a bunch of narrowing implicit conversions to explicitRichard Linden
2012-01-23EXP-1837 FIX parsing notifications.xml during startup can take > 40 seconds (...Richard Linden
2011-11-28a try fix for sh-2651: [crashhunters] Crash after google translate failureXiaohong Bao
2011-11-22remove redundant memory allocation for sh-2651: [crashhunters] Crash after go...Xiaohong Bao
2011-09-06Automated merge with http://hg.secondlife.com/viewer-developmentNat Goodspeed
2011-09-01CHOP-763: publish LLControlGroup::typeStringToEnum(), typeEnumToString()Nat Goodspeed
2011-08-31MergeXiaohong Bao
2011-08-17convert tabs to spaces where they are forbiddenOz Linden
2011-07-15Merge from viewer-developmentXiaohong Bao
2011-05-12mergeDave Parks
2011-04-27Incorporated some suggestions from code review for VWR-25610brad kittenbrink
2011-04-26FIX VWR-25610: LLControlCroup::loadFromFile makes unnecessary copies of large...brad kittenbrink
2011-03-09SOCIAL-654 WIP Items purchased on Marketplace.secondlife.com while logged int...Richard Linden
2011-03-16Automated merge up from viewer-development into mesh-developmentLoren Shih
2011-02-23Merge from viewer-developmentXiaohong Bao
2011-02-22SOCIAL-545 WIP Figure out how to configure skylight-specific settings while r...Richard Linden
2010-12-13Automated merge up from viewer-developmentLoren Shih
2010-12-03first iteration of memory pool codeXiaohong Bao
2010-12-02mergeMonroe Linden
2010-12-01Automated merge up from viewer-developmentLoren Shih
2010-11-09Add name, value info to convert_from_llsd<> specialization LL_ERRS.Nat Goodspeed
2010-10-13correct licenses (fix problem with license change merge)Oz Linden
2010-10-07fix for gccRichard Linden
2010-10-06allow passing LLSD arguments on command lineRichard Nelson
2010-09-30Put some errant tests under if (LL_TESTS) conditional.Dave Parks
2010-09-27mergeDave Parks
2010-09-21Fix for build failures - disabling tcmalloc for nowBrad Payne (Vir Linden)
2010-08-18VWR-20768 (SNOW-507) FIXED Missing LL_TEST conditions in cmake filesAimee Linden
2010-08-13Change license from GPL to LGPL (version 2.1)Oz Linden
2010-02-03CID-266Tofu Linden
2010-02-03CID-267Tofu Linden
2009-10-19Backporting from hg branch @ 3495: Fix to integration test.Steven Bennetts
2009-10-16DEV-41407 resurrect and fix LLControlGroup test, convert it to a llxml integr...Adam Moss
2009-10-03Merge inspectors UI project, gooey-4, into viewer-2 trunk. Added new tooltip...James Cook
2009-08-24merge -r 130399-131510 skinning-21 -> viewer-2.0.0-3Richard Nelson
2009-07-27Merged skinning-17 into viewer-2 for bug fixes. Commented out new IM window ...James Cook
2009-07-16Merged work for DEV-2066 (and formerly QAR-1538) in Viewer 2.Mark Palange
2009-07-14QAR-1602 Checkpoint for Avatar Pipeline Multiple textures branchNeal Orman
2009-07-07Merge skinning-14 to viewer-2, including refactoring many floaters to registe...James Cook
2009-06-22QAR-1383: convert new uses of Boost.Signals (arriving from other branches) toNat Goodspeed
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
2009-06-04Merge of QAR-1383 event-system-7 into trunk.Brad Kittenbrink
2009-05-22svn merge -r121194:121210Adam Moss
2009-04-20Retry. Build system fixes for library-library dependencies, ported from skin...James Cook
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-06 12:30:13 +0000