summaryrefslogtreecommitdiff
path: root/indra/llxml
AgeCommit message (Expand)Author
2013-11-06merge with releaseRichard Linden
2013-09-09merge with viewer-releaseRichard Linden
2013-08-29add "Settings" logging tag to make debugging settings loading easierOz Linden
2013-10-23Merge latest viewer-release with FBCsimon
2013-10-04MAINT-3270 FIXED crash in LLControlCache<unsigned int>::LLControlCache: Contr...maksymsproductengine
2013-08-09second phase summer cleaningRichard Linden
2013-07-30Summer cleaning - removed a lot of llcommon dependencies to speed up build timesRichard Linden
2013-07-25CHOP-962: Make LLControlVariable::setPersist() accept only enum.Nat Goodspeed
2013-07-22CHOP-962: Emit unrecognized-var log message only for Global settings.Nat Goodspeed
2013-07-22Automated merge with https://bitbucket.org/lindenlab/viewer-interestingRichard Linden
2013-07-22BUIDLFIX: moved LLThreadSafeRefCount to proper fileRichard Linden
2013-07-19BUILDFIX: #include and dependency cleanupRichard Linden
2013-07-18SH-4297 WIP interesting: viewer-interesting starts loading cached scene lateRichard Linden
2013-07-17CHOP-962: Preserve unrecognized user settings variables.Nat Goodspeed
2013-07-17CHOP-962: Make LLControlGroup::declare* return LLControlVariable*Nat Goodspeed
2013-05-01Merge vwr-dev-matGraham Madarasz
2013-04-30Merge 3.5.1 into MaterialsGraham Madarasz
2013-04-19merge changes for DRTVWR-294Oz Linden
2013-03-29Update Mac and Windows breakpad builds to latestGraham Madarasz
2013-03-11Viewer-chui mergeprep
2013-03-05Fixing issues with not detecting when LLSD XML parsing fails. Changing most ...Don Kjer
2013-01-30Pull merge from lindenlab/viewer-developementMerov Linden
2013-01-24merging in viewer-beta.Nyx Linden
2012-12-04Pull and merge viewer-developmentsimon@Simon-PC.lindenlab.com
2012-11-28SH-3563. Pull and merge from viewer-development. Modest code changes to fix a...prep
2012-11-20Pull and merge from ssh://hg@bitbucket.org/lindenlab/viewer-beta.William Todd Stinson
2012-10-11Updating linux build to gcc4.6Don Kjer
2012-10-02Fixed LLControlGroup::get() template to not crash on missing items. Reviewedsimon@Simon-PC.lindenlab.com
2012-09-13Fleshed out target_link_libraries dependencies between libraries. Appearance...Don Kjer
2012-10-11Make LLTransUtil::parseStrings() merge all relevant strings.xml files.Nat Goodspeed
2012-07-27Pull and merge from ssh://hg@bitbucket.org/lindenlab/viewer-release.Todd Stinson
2012-07-24fix for gcc buildsRichard Linden
2012-07-23CHUI-227 FIX Teleport offers sent are not receivedRichard Linden
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