summaryrefslogtreecommitdiff
path: root/indra/newview/llappviewer.cpp
AgeCommit message (Collapse)Author
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-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
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-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-18Updated client to use new capsdolphin
brought over server changes to llExperienceCache
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-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-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
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-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-05CHUI-468 : Suppress LLCallFloater completelyMerov Linden
2012-10-31storm-1850: ensure that last exec event reports apply only to the same versionOz Linden
2013-03-27add platform and platform version to login request parameters for new ↵Oz Linden
version manager query
2013-03-08merge changes for 3.5.0-beta2Oz Linden
2013-02-27finish changes to update handling, including notices of channel changesOz Linden
2013-02-25disable willing-to-test for Test viewersOz Linden
2013-02-21add use of v1.1 update request protocol, with fallback to v1.0Oz Linden
2013-02-07derive version number from indra/VIEWER_VERSION.txtOz Linden
2012-10-17Pull and merge from ssh://stinson@hg.lindenlab.com/richard/viewer-chui/.William Todd Stinson
2012-10-16Automated merge with file:///Users/nat/linden/viewer-sourceidNat Goodspeed
2012-10-16Introduce LLAppViewer::initStrings(); reload default_trans_args.Nat Goodspeed
Calling LLTrans::setDefaultArg() after LLTransUtil::parseStrings() is almost good enough -- but it fails to address the case in which one or more of the default_trans_args strings (e.g. "create_account_url") embeds a reference to the new substitution. So after the setDefaultArg() call, go back through default_trans_args, refetching each string to perform the substitution and updating it with a setDefaultArg() call of its own. All this is way too much logic to replicate in both LLAppViewer::initConfiguration() and init(), so break out new LLAppViewer::initStrings() method and call it from both places.
2012-10-15Merge in viewer-development code and fix buildsimon@Simon-PC.lindenlab.com
generated by cgit v1.2.3 (git 2.25.1) at 2025-01-21 21:12:42 +0000