summaryrefslogtreecommitdiff
path: root/indra/newview/CMakeLists.txt
AgeCommit message (Expand)Author
2013-07-11Merged in viewer-releaseAura Linden
2013-05-22merge changes for 3.5.3-releaseOz Linden
2013-05-21CHOP-947: create summary.json (really python) metadata file for TeamCity resultsOz Linden
2013-05-15Thanks mercurial.Aura Linden
2013-05-11Merge viewer-dev-materials and bugfix in LLPanelFace::getState using material...Graham Madarasz
2013-05-10Fixup merge diffsGraham Madarasz
2013-05-10merge changes for 3.5.2-beta4Oz Linden
2013-05-08merge changes for 3.5.1-releaseOz Linden
2013-05-07merge changes for DRTVWR-299Oz Linden
2013-04-30Merge 3.5.1 into MaterialsGraham Madarasz
2013-04-30Fix vwr-dev-mat merge bugs in llpanelface (missing Oz fix) and XMLGraham Madarasz
2013-04-26Fix llmediadataclient test to include new dep on llprimitive and fix bogus bo...Graham Madarasz
2013-04-25Merge 3.5.1 into MaterialsGraham Madarasz
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-17Merge with viewer-developmentcallum_linden
2013-04-16merge up to 3.5.2 developmentOz Linden
2013-04-01merge changes for 3.5.0-beta7Oz Linden
2013-03-29Update Mac and Windows breakpad builds to latestGraham Madarasz
2013-03-27New gmock with WChar fix and add boost sys lib to viewer source testsGraham Madarasz
2013-03-27Rollback the boost sys lib inclusion in integ tests as it was causing dup sym...Graham Madarasz
2013-03-26Add Boost System library to all testsOz Linden
2013-03-11Viewer-chui mergeprep
2013-02-21MAINT-2389: Change viewer to Boost package without ucontext.h.Nat Goodspeed
2013-02-15Added ca-bundle.crt behaviors for Mac and Windows.Aura Linden
2013-02-13Merge from viewer-betaprep
2013-02-12merge up to 3.4.5-releaseOz Linden
2013-02-05Merged with head of viewer-developmentcallum_linden
2013-02-04Added a new draw pool specifically for faces with materials applied to them. ...Geenz
2013-02-04fmodwrapper uneeded with fmodexSovereign Engineer
2013-02-01Removed (most) references to older FMOD library - still a little Linux clean ...callum_linden
2013-01-30Pull merge from lindenlab/viewer-developementMerov Linden
2013-01-25CHUI-667 Upon exit from DND mode, a maximum of one sound should be played. So...Gilbert Gonzales
2013-01-24merging in viewer-beta.Nyx Linden
2013-01-24Automated merge with ssh://bitbucket.org/lindenlab/viewer-developmentNat Goodspeed
2013-01-18first push - patch from CmdCupCake plus force FMODEX oncallum_linden
2013-01-16remove prototype access code used for server testingOz Linden
2013-01-11Automated merge with http://hg.secondlife.com/viewer-developmentNat Goodspeed
2013-01-10Merge pull from lindenlab/viewer-betaMerov Linden
2013-01-09MAINT-1481: remove linux-updater; move logic to Linux update_installNat Goodspeed
2012-12-18CHUI-499: Adding ability to serialize the communication notifications to loca...William Todd Stinson
2012-12-12CHUI-499: Refactoring the persistent notification storage so that I can reuse...William Todd Stinson
2012-12-05Linux Viewer build fixes.Logan Dethrow
2012-12-04Fix merge breakagesimon@Simon-PC.lindenlab.com
2012-12-04Pull in upstream viewer-development via viewer-lionsimon@Simon-PC.lindenlab.com
2012-12-04Pull and merge viewer-developmentsimon@Simon-PC.lindenlab.com
2012-12-03Started LLMaterialMgr to handle viewer<->region materials communicationKitty Barnett
2012-11-28SH-3563. Pull and merge from viewer-development. Modest code changes to fix a...prep
2012-11-27Pull and merge from https://bitbucket.org/lindenlab/viewer-development.William Todd Stinson
2012-11-27merge changes for DRTVWR-230Oz Linden