summaryrefslogtreecommitdiff
path: root/indra/newview/llappviewer.cpp
AgeCommit message (Expand)Author
2013-06-21Automated merge with file:///F:%5Cviewer-bearDave Parks
2013-06-20Automated merge with http://bitbucket.org/lindenlab/viewer-releaseDave Parks
2013-06-03Fix and organize code for managing marker files that detect last_exec_event a...Oz Linden
2013-05-29Merge downstream codesimon
2013-05-29Merge latest viewer-releasesimon
2013-05-24merge changes for maint-2724Oz Linden
2013-05-23MAINT-2724: Make viewer explicitly set coroutine stack size.Nat Goodspeed
2013-05-20Merge downstream codesimon
2013-05-20Get latest from viewer-releasesimon
2013-05-16merge changes for 3.5.3-beta6Oz Linden
2013-05-15MAINT-2665: fix crashes being counted as wrong type in last_exec_event due to...Oz Linden
2013-05-14NORSPEC-151 NORSPEC-152 fix handling of disable of bumpy and shiny in graphic...Graham Madarasz
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-09Merge downstream code and viewer-betasimon
2013-05-09Merge viewer-betasimon
2013-05-09MAINT-2665 FIX Crashes not being reported in some casesRichard Linden
2013-05-08merge changes for 3.5.1-releaseOz Linden
2013-05-01Merge vwr-dev-matGraham Madarasz
2013-04-30Merge 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-11Forgot to commit @#! mergesimon
2013-04-11Merge in downstream code (chui fixes, materials)simon
2013-04-11Mergesimon
2013-04-02Add reporting of last_exec_durationOz Linden
2013-03-29Update Mac and Windows breakpad builds to latestGraham Madarasz
2013-03-28MAINT-2426 : Viewer support for new simulator AvatarRenderInfo capability. R...simon
2013-03-25Pull in downstream CHUI code from viewer-developmentsimon
2013-03-20Removed avatar stuff from asset metrics, again. Must have gotten broken in a ...Brad Payne (Vir Linden)
2013-03-19Merge in viewer-beta to get CHUI codeSimon Linden
2013-03-12SH-3944 WIP CHUI merge fixingNyx Linden
2013-03-11mergeprep
2013-03-11mergeprep
2013-03-11Viewer-chui mergeprep
2013-03-04MAINT-2371 More optimizations.Dave Parks
2013-02-15SH-3867 FIX - on logout, wait for any pending metrics uploads to completeBrad Payne (Vir Linden)
2013-02-11SH-3852 WIP - removed avatar metrics from ViewerAssetMetricsBrad Payne (Vir Linden)
2013-02-07SH-3852 WIP - track per-timer statsBrad Payne (Vir Linden)
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-29CHUI-667: Attempting to correct Mac/Linux build issue.Gilbert Gonzales
2013-01-28CHUI-667: Post code review changesGilbert Gonzales
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-10Merge pull from lindenlab/viewer-betaMerov Linden
2012-12-13MAINT-2123 remove WARNINGS about unknown local_id in KillObject messageAndrew Meadows