summaryrefslogtreecommitdiff
path: root/indra/newview/tests
AgeCommit message (Expand)Author
2013-10-16mergeBrad Payne (Vir Linden)
2013-09-04mergeBrad Payne (Vir Linden)
2013-08-26Merge downstream code from CHUIStorm releasesimon
2013-08-16merge with viewer-releaseNyx Linden
2013-08-07merge changes for DRTVWR-333Oz Linden
2013-07-25CHOP-962: Make LLControlVariable::setPersist() accept only enum.Nat Goodspeed
2013-07-17CHOP-962: Make LLControlGroup::declare* return LLControlVariable*Nat Goodspeed
2013-07-09CHOP-963: Make update service query url depend on the grid rather than settingsOz Linden
2013-06-21Automated merge with file:///F:%5Cviewer-bearDave Parks
2013-05-21mergeBrad Payne (Vir Linden)
2013-05-11Merge viewer-dev-materials and bugfix in LLPanelFace::getState using material...Graham Madarasz
2013-05-10merge changes for 3.5.2-beta4Oz Linden
2013-05-10SH-4176 WIP - allow retries on 4xx errors if enabled by flag. So enable in th...Brad Payne (Vir Linden)
2013-05-09Merge downstream code and viewer-betasimon
2013-05-01Merge vwr-dev-matGraham Madarasz
2013-04-30Merge 3.5.1 into MaterialsGraham Madarasz
2013-04-24diff -r 59c7bed66dfd indra/llcommon/lleventapi.hsimon
2013-04-19merge up to latest viewer-development for merge to 3.5.2Oz Linden
2013-04-19merge changes for DRTVWR-294Oz Linden
2013-04-16SH-4061 WIP - fix for build issues on mac, reset the retry policy on success.Brad Payne (Vir Linden)
2013-04-16merge up to 3.5.2 developmentOz Linden
2013-04-15SH-4061 WIP - improved retry policy test, turned up and fixed a bug in getSec...Brad Payne (Vir Linden)
2013-04-15SH-4061 - integrated LLHttpRetryPolicy with new corehttp header parsingBrad Payne (Vir Linden)
2013-04-12SH_4061 WIP - retry policy org and testsBrad Payne (Vir Linden)
2013-04-12SH-4061 WIP - moved retry policy to newview so it can work with either llmess...Brad Payne (Vir Linden)
2013-04-11Merge in downstream code (chui fixes, materials)simon
2013-03-29Update Mac and Windows breakpad builds to latestGraham Madarasz
2013-03-20merging in changes from sunshine-stableNyx Linden
2013-03-20Removed avatar stuff from asset metrics, again. Must have gotten broken in a ...Brad Payne (Vir Linden)
2013-03-13Merging LLCURL::Responder changes with CHUI changes. Fixed gcc 4.6 compile f...Don Kjer
2013-03-13Large changes to the LLCurl::Responder API, as well as pulling in some change...Don Kjer
2013-03-11mergeprep
2013-03-11mergeprep
2013-03-11more test build fixBrad Payne (Vir Linden)
2013-03-11Viewer-chui mergeprep
2013-03-11Fix for build failure in testsBrad Payne (Vir Linden)
2013-03-05Fixing issues with not detecting when LLSD XML parsing fails. Changing most ...Don Kjer
2013-03-01Fix integration tests broken by instancetracker changesGraham Madarasz (Graham)
2013-02-11fix for build failure on test w/linuxBrad Payne (Vir Linden)
2013-02-11SH-3852 WIP - removed avatar metrics from ViewerAssetMetricsBrad Payne (Vir Linden)
2013-01-24merging in viewer-beta.Nyx Linden
2012-12-17Pull and merge from https://bitbucket.org/lindenlab/viewer-development.William Todd Stinson
2012-12-11Merged from viewer-releaseAura Linden
2012-12-05Linux Viewer build fixes.Logan Dethrow
2012-11-28SH-3563. Pull and merge from viewer-development. Modest code changes to fix a...prep
2012-11-21Pull and merge https://bitbucket.org/lindenlab/viewer-development.William Todd Stinson
2012-11-13Pull and merge from https://bitbucket.org/lindenlab/viewer-development.William Todd Stinson
2012-11-12Ported slplugin and some other missing components for cocoa.Aura Linden
2012-11-07Merge. Refresh DRTVWR-209 with 3.4.2-beta1 code.Monty Brandenberg
2013-03-27change login to pass only the version instead of channel+version in the versi...Oz Linden