summaryrefslogtreecommitdiff
path: root/indra/newview/llappviewer.cpp
AgeCommit message (Collapse)Author
2013-06-17Merged with viewer-releaseGeenz
2013-06-03Fix and organize code for managing marker files that detect last_exec_event ↵Oz Linden
and last_exec_duration
2013-05-30Pull merge from viewer-releaseMerov Linden
2013-05-29Merge downstream codesimon
2013-05-29Merge latest viewer-releasesimon
2013-05-29Merge with 3.5.4 releasedolphin
2013-05-24merge changes for maint-2724Oz Linden
2013-05-23MAINT-2724: Make viewer explicitly set coroutine stack size.Nat Goodspeed
Introduce LLCoros::setStackSize(), with a compile-time default value we hope we never have to use. Make LLAppViewer call it with the value of the new settings variable CoroutineStackSize as soon as we've read settings files. (While we're at it, notify interested parties that we've read settings files.) Give CoroutineStackSize a default value four times the previous default stack size. Make LLCoros::launch() pass the saved stack size to each new coroutine instance. Re-enable lleventcoro integration test. Use LLSDMap() construct rather than LLSD::insert(), which used to return the modified object but is now void.
2013-05-22Pull merge from viewer-releaseMerov Linden
2013-05-20Merge downstream codesimon
2013-05-20Get latest from viewer-releasesimon
2013-05-20Merge with viewer-releasedolphin
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 ↵Oz Linden
to log macro wrapper
2013-05-14NORSPEC-151 NORSPEC-152 fix handling of disable of bumpy and shiny in ↵Graham Madarasz
graphics panel to also disable deferred properly and add hooks for default norm and spec textures in texture picker
2013-05-13Merged with https://bitbucket.org/lindenlab/viewer-betaGeenz
2013-05-11Merge viewer-dev-materials and bugfix in LLPanelFace::getState using ↵Graham Madarasz
material instead of mMaterial
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
made marker file lock use append, not truncate
2013-05-08merge changes for 3.5.1-releaseOz Linden
2013-05-02ACME-306 : Pull merge from viewer-chuiMerov Linden
2013-05-01Merge vwr-dev-matGraham Madarasz
2013-04-30Merge 3.5.1 into MaterialsGraham Madarasz
2013-04-26made sendURLToOtherInstance() happen before viewer window actually appears, ↵Cho
in the event of an external browser launching a SLApp
2013-04-26removed internal browser hack for getting auth code in favor of SLApp-only ↵Cho
approach
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-18Merge with viewer-developmentdolphin
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-04Merge with viewer-developmentdolphin
2013-04-02Merge with viewer-developmentdolphin
2013-04-02Add reporting of last_exec_durationOz Linden
(and clean up logic around multiple instances)
2013-03-29Update Mac and Windows breakpad builds to latestGraham Madarasz
2013-03-28MAINT-2426 : Viewer support for new simulator AvatarRenderInfo capability. ↵simon
Reviewed by Kelly
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)
merge at some point.
2013-03-19Merge in viewer-beta to get CHUI codeSimon Linden
2013-03-12SH-3944 WIP CHUI merge fixingNyx Linden
re-introduced don's refactor of low-level openGL calls pulling out of llui and putting them into llrender. Took the new code from their updated versions from the CHUI merge, but put them in a place accessible to appearance utility.
2013-03-11mergeprep
2013-03-11mergeprep
2013-03-11Viewer-chui mergeprep
2013-03-04MAINT-2371 More optimizations.Dave Parks
Reviewed by Graham
2013-02-15SH-3867 FIX - on logout, wait for any pending metrics uploads to completeBrad Payne (Vir Linden)