summaryrefslogtreecommitdiff
path: root/indra/newview/llappviewer.cpp
AgeCommit message (Expand)Author
2013-05-10Fixup merge diffsGraham Madarasz
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-04-17Merge with viewer-developmentcallum_linden
2013-03-29Update Mac and Windows breakpad builds to latestGraham Madarasz
2013-03-20Removed avatar stuff from asset metrics, again. Must have gotten broken in a ...Brad Payne (Vir Linden)
2013-03-12SH-3944 WIP CHUI merge fixingNyx Linden
2013-03-11mergeprep
2013-03-11mergeprep
2013-03-11Viewer-chui mergeprep
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-11-30MAINT-1991 Attempt to mitigate crashes in GL drivers by encouraging people to...Dave Parks
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-11-20Automated merge with https://bitbucket.org/lindenlab/viewer-developmentDave Parks
2012-11-20merge changes for DRTVWR-246Oz Linden
2012-11-09Pull and merge from ssh://hg@bitbucket.org/lindenlab/viewer-beta.William Todd Stinson
2012-11-09CHUI-337 FIXED: To avoid confusion with a classes "...conversation..." and in...AlexanderP ProductEngine
2012-11-07Automated merge with http://bitbucket.org/lindenlab/viewer-betaDave Parks
2012-11-07MAINT-1815 Fix for excessive memory usage in Mayfair. Disable tcmalloc. Dis...Dave Parks
2012-11-05CHUI-468 : Suppress LLCallFloater completelyMerov Linden
2012-10-17Pull and merge from ssh://stinson@hg.lindenlab.com/richard/viewer-chui/.William Todd Stinson
2012-10-15Merge in viewer-development code and fix buildsimon@Simon-PC.lindenlab.com
2012-10-10pull back 3.4.1-beta6 fixesOz Linden
2012-10-10Pull and merge from ssh://hg@bitbucket.org/oz_linden/viewer-beta-drtvwr-179.William Todd Stinson
2012-10-09MAINT-1688 Potential fix for crash on exit in LLTextureFetchDave Parks
2012-10-03Fix non-thread-safe refcounting of LLHTTPClient::Responder and fix out-of-ord...Dave Parks
2012-10-03CHUI-378 FIXED (Conversation floater is not opened if call initiated and acce...AlexanderP ProductEngine
2012-10-02Instrument debug builds on windows to help track down source of heap corruptionDave Parks
2012-09-23Removing unused gHeadlessClient code from viewerDon Kjer
2012-09-20reapply 04fdf7945708: MAINT-775 Fix for particle index pool corruption on tel...Dave Parks
2012-09-13CHUI-321 FIXED (Indicate within the Call Log why there's nothing in it)Paul ProductEngine
2012-09-13Fleshed out target_link_libraries dependencies between libraries. Appearance...Don Kjer
2012-09-10Backing out the changes contributing to DRTVWR-167 and DRTVWR-179 from the re...William Todd Stinson
2012-09-08Removed most llappearance -> llui dependencies (LLTrans remains). Moved LLIn...Don Kjer
2012-11-14DRTVWR-241: resolve merge conflict with viewer-development.Nat Goodspeed
2012-11-14Automated merge with http://hg.secondlife.com/viewer-developmentNat Goodspeed
2012-11-13Automated merge with http://hg.secondlife.com/viewer-developmentNat Goodspeed
2012-11-07Merge. Refresh DRTVWR-209 with 3.4.2-beta1 code.Monty Brandenberg
2012-11-06Automated merge with http://hg.secondlife.com/viewer-developmentNat Goodspeed