summaryrefslogtreecommitdiff
path: root/indra/newview/llappviewer.cpp
AgeCommit message (Collapse)Author
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-23Mergedolphin
2013-01-10Merge pull from lindenlab/viewer-betaMerov Linden
2013-01-08MergeXiaohong Bao
2013-01-04Automated merge with http://bitbucket.org/lindenlab/viewer-developmentRichard 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.
2012-12-18SH-3406 WIP convert fast timers to lltrace systemRichard Linden
removed some potential data races got memory stats recording in trace system
2012-12-18Updated client to use new capsdolphin
brought over server changes to llExperienceCache
2012-12-13We now handle local_id=0 in KillObject as a prefix to deleted local_id's.Andrew Meadows
This is the real viewer-side work that was the motivation for MAINT-2123. Reviewed with Bao.
2012-12-13MAINT-2123 remove WARNINGS about unknown local_id in KillObject messageAndrew Meadows
We now ignore unkown local_id's in KillObject. Reviewed with davep.
2012-12-03SH-3406 WIP convert fast timers to lltrace systemRichard Linden
converted fast timer view over to new lltrace mechanisms
2012-12-01SH-3406 WIP convert fast timers to lltrace systemRichard Linden
fixed scale of reported times moved reset calls to happen at same time so we don't show partial results
2012-11-30SH-3406 WIP convert fast timers to lltrace systemRichard Linden
fixed crash when sending viewer asset stats
2012-11-30MAINT-1991 Attempt to mitigate crashes in GL drivers by encouraging people ↵Dave Parks
to update their drivers. Reviewed by Simon
2012-11-28SH-3563. Pull and merge from viewer-development. Modest code changes to fix ↵prep
alignment issue in llAppearance.
2012-11-27Automated merge with ssh://hg.lindenlab.com/richard/viewer-interesting-metricsRichard Linden
2012-11-27SH-3406 WIP convert fast timers to lltrace systemRichard Linden
fixed precision of fast timer counts
2012-11-27SH-3406 WIP convert fast timers to lltrace systemRichard Linden
hunting down bad values and crashes
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-19merge with viewer-developmentRichard 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-16SH-3406 WIP convert fast timers to lltrace systemRichard Linden
got new fast timer code to compile and run
2012-11-15SH-3406 WIP convert fast timers to lltrace systemRichard Linden
eliminated min and max macros from windows.h got rest of viewer to compile against llfasttimer changes
2012-11-14SH-3406 WIP convert fast timers to lltrace systemRichard Linden
cleaning up build moved most includes of windows.h to llwin32headers.h to disable min/max macros, etc streamlined Time class and consolidated functionality in BlockTimer class llfasttimer is no longer included via llstring.h, so had to add it manually in several places
2012-11-14DRTVWR-241: resolve merge conflict with viewer-development.Nat Goodspeed
LLUI::setupPaths() went away with DRTVWR-210.
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 ↵AlexanderP ProductEngine
in accordance with the naming convention in the project, some classes and corresponding files should be renamed: LLIMConversation -> LLFloaterIMSessionTab LLIMFloater -> LLFloaterIMSession LLNearbyChat -> LLFloaterIMNearbyChat LLIMFloaterContainer -> LLFloaterIMContainer LLNearbyChatBarListener -> LLFloaterIMNearbyChatListener LLNearbyChatHandler -> LLFloaterIMNearbyChatHandler
2012-11-08SH-3499 WIP Ensure asset stats output is correctRichard Linden
Finished making LLUnit implicitly convertible to/from scalar integer values cleaned up test code
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. ↵Dave Parks
Disable private memory pools. Make viewer large address aware on windows. Reviewed by Kelly
2012-11-07Merge. Refresh DRTVWR-209 with 3.4.2-beta1 code.Monty Brandenberg
Two fairly simple conflicts: dead stats sending code in the texture fetch code (new llcorehttp library) and the cleanup code in llappviewer was moved around in 3.4.x.
2012-11-06Automated merge with http://hg.secondlife.com/viewer-developmentNat Goodspeed
2012-11-06Automated merge with http://hg.secondlife.com/viewer-developmentNat Goodspeed
2012-11-05SH-3499 WIP Ensure asset stats output is correctRichard Linden
fixed copy behavior of recordings and accumulator buffers
2012-11-05CHUI-468 : Suppress LLCallFloater completelyMerov Linden