summaryrefslogtreecommitdiff
path: root/indra/newview/llappviewer.cpp
AgeCommit message (Collapse)Author
2013-05-22Pull merge from viewer-releaseMerov Linden
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 ↵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-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
(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)
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
up left
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. ↵Gilbert Gonzales
Solution. Added a deferred sound class which will have sound id's added to it and upon unmuting the deferred sounds will be played.
2013-01-24Merged with latest viewer-dev.Geenz
2013-01-24merging in viewer-beta.Nyx Linden
Most of the merge was clean, a couple conflicts. Brought over a couple patches manually for llpolymesh.
2013-01-10Merge pull from lindenlab/viewer-betaMerov Linden
2013-01-02OS X crash on startup fix: always ensure that mMainLoopInitialized is ↵Geenz
initialized properly within LLAppViewer::init(). Otherwise, the viewer will sporadically crash on start up.
2012-12-29Huge amount of refactoring to use Cocoa here:Geenz
- Updated to .xib format. To produce a new nib (which is required after changing the xib file), use "ibtool SecondLife.xib --compile SecondLife.nib" within the newview directory. - xib file now defines the viewer's window. VIews are still being pragmatically added to the main window. This may change in the future. - LLAppViewer's main loop has been slightly refactored to be executed on a timer for OS X. This probably needs a bit more work. - Event handling still needs more work to work within a timer based event loop. It works fairly sporadically at the moment, as if events are being dropped between timer executions, at least for the mouse. - Carbon has been purged from the viewer's startup, and from LLWindow entirely. There's likely still a few odds and ends fragmented throughout the viewer and its dependencies. Need to track these down. - LLAppViewerMacOSX now uses NSApplicationMain, and also implements the NSApplicationDelegate protocol in LLAppDelegate. - Fullscreen support has been implemented for OS X 10.7+ This is still a work in progress, however at this stage everything needed for a functional viewer is (mostly) complete. From here, it's mostly just bug hunting and fixing.