summaryrefslogtreecommitdiff
path: root/indra/newview/llappviewer.h
AgeCommit message (Collapse)Author
2021-03-09This set of changes reverts the merge with master (git revert c83e740) and ↵Callum Prentice
results in a version of the DRTVWR-519 that matches what was presemt before it was deployed as a release viewer *plus* 3 small fixes from Maxim (See commits). This branch can now be used for additional fixes before eventually being used to release D-519 as normal
2021-03-09Merge branch 'master' into DRTVWR-514-keymappingsAndrey Lihatskiy
2021-03-08Revert "Merge branch 'master' of https://bitbucket.org/lindenlab/viewer into ↵Brad Payne (Vir Linden)
DRTVWR-519" This reverts commit e61f485a04dc8c8ac6bcf6a24848359092884d14, reversing changes made to 00c47d079f7e958e473ed4083a7f7691fa02dcd5.
2021-03-02Merge branch 'master' v 6.4.15 into DRTVWR-525Dave Houlton
2021-03-02Merge branch 'master' into DRTVWR-514-keymappingsAndrey Lihatskiy
2021-02-03Merge with Master after Viewer releaseCallum Prentice
2021-02-01Merge branch 'master' into DV525-merge-6.4.13Dave Houlton
2021-02-01Merge branch 'master' into DRTVWR-514-keymappingsAndrey Kleshchev
# Conflicts: # indra/llui/llscrolllistctrl.cpp
2021-01-15SL-14283 Don't crash viewer, only show a notificationAndrey Kleshchev
2020-11-17SL-14342 FIXED Crash: "Uninitialized param singleton LLVoiceClient"Mnikolenko Productengine
2020-11-11Revert "SL-13565, clean up now-orphaned throttling variable and handling code"Andrey Kleshchev
This reverts commit 6c1a15d936763dc14f368e10bd53c6e351bf0136.
2020-10-19DRTVWR-510 clean up obsolete downstream-from-mDebugGPU codeDave Houlton
2020-10-12SL-14078 No point in verifying display name cap each frame #2Andrey Kleshchev
2020-09-28Merge with tip of ReleaseCallum Prentice
2020-09-16First part of change to remove LLVFS from the Viewer. Consists of code ↵Callum Prentice
changes to remove LLVFS and LLVFSThread classes along with the associated source files. The existing llvfs folder is renamed to llcache. Also includes changes to CMake script in many places to reflect changes. Eventually, llvfile source file and class will be renamed but that is not in this change.
2020-08-20SL-13565, clean up now-orphaned throttling variable and handling codeDave Houlton
2020-01-28DRTVWR-440, merge in latest from 6.3.7 releaseDave Houlton
2020-01-07SL-12486 Better data deletionandreykproductengine
2019-05-08Merge viewer-releaseGraham Linden
2019-01-15SL-10291 Replace apr_atomic with standard C++11 functionalityandreykproductengine
2018-06-13Mods to hook up water settings to water normals for rendering with support ↵Graham Linden
for current to next blending. Modify LLSettingsFoo::buildDefaultFoo to use a static and avoid re-validation of default sky/water/daycycle settings. Remove all references to gSun/MoonTextureId globals (they should come from sky settings now).
2018-01-30MAINT-8180 Add the way to get default string despite of current localiztionmaxim_productengine
2018-01-17Merged in lindenlab/viewer-bearAndreyL ProductEngine
2017-11-29DRTVWR-418: Merge from latest viewer-releaseNat Goodspeed
2017-11-16MAINT-8154 Disabled exception handling in LLAppViewer::frame() to get proper ↵AndreyL ProductEngine
call stacks
2017-10-11Automated merge with ssh://bitbucket.org/lindenlab/viewer-releaseNat Goodspeed
2017-08-25MAINT-7739 Make LLOSInfo a Singletonandreykproductengine
2017-08-10MAINT-7596 FIXED System information is truncated in JIRA issues filed ↵Mnikolenko Productengine
through "Report bug" viewer option
2017-06-27MAINT-7554 Frame throttlingandreykproductengine
2017-10-06MAINT-1013 Changing YieldTime should show effects immediatelyandreykproductengine
2016-12-22MAINT-7024 Release notes page was requested prior to proxy initialization.andreykproductengine
2017-03-16mergecoyot@coyot-sager-PC
2017-03-16pull from viewer64 gatecoyot@coyot-sager-PC
2017-03-06Automated merge with ssh://bitbucket.org/lindenlab/viewer-releaseNat Goodspeed
2017-03-01SL-321: fix merge removal of mIsFirstRun definition, remove pyinstaller from ↵Glenn Glazer
viewer cmake, now in VMP package cmake
2017-02-28mergecoyot@coyot-sager-PC
2016-12-20DRTVWR-418 fix BOOL/bool comparison that errors out as as warning on VS 2013 ↵Callum Prentice
builds
2016-10-10Merged in lindenlab/viewer-releaseAndreyL ProductEngine
2016-08-18SL-323: first pass at ripping out old updaterGlenn Glazer
2016-07-13MAINT-6493 SL Viewer does not respect the Windows 10 display setting size sliderpavelkproductengine
2016-06-30DRTVWR-418: Unify control flow through LLAppViewer across platforms.Nat Goodspeed
The LLApp API used to consist of init(), mainLoop(), cleanup() methods. This makes sense -- but on Mac that structure was being subverted. The method called mainLoop() was in fact being called once per frame. There was initialization code in the method, which (on Mac) needed to be skipped with an already-initialized bool. There was a 'while' loop which (on Mac) needed to be turned into an 'if' instead so the method would return after every frame. Rename LLApp::mainLoop() to frame(). Propagate through subclasses LLAppViewer and LLCrashLogger. Document the fact that frame() returns true to mean "done." (This was always the case, but had to be inferred from the code.) Rename the Mac Objective-C function mainLoop to oneFrame. Rename the C++ free function it calls from runMainLoop() to pumpMainLoop(). Add comments to llappdelegate-objc.mm explaining (inferred) control flow. Change the Linux viewer main() and the Windows viewer WINMAIN() from a single LLAppViewer::mainLoop() call to repeatedly call frame() until it returns true. Move initialization code from the top of LLAppViewer::frame() to the init() method, where it more properly belongs. Remove corresponding mMainLoopInitialized flag (and all references) from LLAppViewer. Remove 'while (! LLApp::isExiting())' (or on Mac, 'if (! LLApp::isExiting())') from LLAppViewer::frame() -- thus unindenting the whole body of the 'while' and causing many lines of apparent change. (Apologies to reviewers.) There are four LLApp states: APP_STATUS_RUNNING, APP_STATUS_QUITTING, APP_STATUS_STOPPED and APP_STATUS_ERROR. Change LLAppViewer::frame() return value from (isExiting()) (QUITTING or ERROR) to (! isRunning()). I do not know under what circumstances the state might transition to STOPPED during a frame() call, but I'm quite sure that if it does, we don't want to call frame() again. We only want a subsequent call if the state is RUNNING. Also rename mainLoop() method in LLCrashLogger subclasses LLCrashLoggerWindows, LLCrashLoggerMac, LLCrashLoggerLinux. Of course it's completely up to the frame() method whether to yield control; none of those in fact do. Honor protocol by returning true (frame() is done), even though each one's main() caller ignores the return value. In fact LLCrashLoggerWindows::mainLoop() wasn't using the return protocol correctly anyway, returning wParam or 0 or 1 -- possibly because the return protocol was never explicitly documented. It should always return true: "I'm done, don't call me again."
2016-05-24MAINT-6419 Simplified the version check + buildfixAndreyL ProductEngine
2016-04-21MAINT-6317 [QuickGraphics-RC] Some rigged mesh attachments render fully on ↵ruslantproductengine
jellybaby avatars when ALM is enabled FIXED - remove global identifier for the black texture - add black texture 2x2x3 localy on apllication startup - add special flag to LLViewerFetchedTexture for protect from removing
2016-01-15merge changes for 4.0.1-releaseOz Linden
2015-11-10remove execute permission from many files that should not have itOz Linden
2015-10-27MAINT-3491 FIXED If ALM is enabled while in wireframe mode, disabling ↵ruslantproductengine
wireframe mode results in a black screen.
2015-07-10merge up to 3.8.0-release (and fix for unit tests with a proxy enabled)'Oz Linden
2015-06-29Replace hg.secondlife.com with bitbucket.org/lindenlab/viewer-releaseOz Linden
Incorporate viewer channel and version into doxygen output Use the autobuild configuration as a variant to build doxygen docs. Upload doxygen docs as a tarball if generated.
2015-06-25merge buildcleanupOz Linden
2015-04-15Merge viewer-releasesimon
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-23 21:29:04 +0000