summaryrefslogtreecommitdiff
path: root/indra/newview/llappviewer.cpp
AgeCommit message (Expand)Author
2013-04-11Forgot to commit @#! mergesimon
2013-04-11Merge in downstream code (chui fixes, materials)simon
2013-04-11Mergesimon
2013-04-04Merge with viewer-developmentdolphin
2013-04-02Merge with viewer-developmentdolphin
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-11removed reference to std::string::back for linuxy compilationdolphin
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-24Merged with latest viewer-dev.Geenz
2013-01-24merging in viewer-beta.Nyx Linden
2013-01-23Mergedolphin
2013-01-10Merge pull from lindenlab/viewer-betaMerov Linden
2013-01-02OS X crash on startup fix: always ensure that mMainLoopInitialized is initial...Geenz
2012-12-29Huge amount of refactoring to use Cocoa here:Geenz
2012-12-18Updated client to use new capsdolphin
2012-12-13MAINT-2123 remove WARNINGS about unknown local_id in KillObject messageAndrew Meadows
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-26Mergedolphin@dolphin-THINK.lindenlab.com
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-19Mergedolphin@dolphin-THINK.lindenlab.com
2012-11-19Test populating the experience keys UI with avatar name data.dolphin@dolphin-THINK.lindenlab.com
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-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-07Merge. Refresh DRTVWR-209 with 3.4.2-beta1 code.Monty Brandenberg
2012-11-06Automated merge with http://hg.secondlife.com/viewer-developmentNat Goodspeed