summaryrefslogtreecommitdiff
path: root/indra/newview/llappviewer.cpp
AgeCommit message (Collapse)Author
2017-11-29DRTVWR-418: Merge from latest viewer-releaseNat Goodspeed
2017-11-29merge changes for 5.0.9-releaseOz Linden
2017-11-16MAINT-8154 Disabled exception handling in LLAppViewer::frame() to get proper ↵AndreyL ProductEngine
call stacks
2017-10-17Merged lindenlab/viewer64 into defaultThomas Nelson
2017-10-13Watter settings active and start of new joystick button type.Rider Linden
2017-10-11DRTVWR-418: Fix glitch from merging from today's viewer-releaseNat Goodspeed
2017-10-11Automated merge with ssh://bitbucket.org/lindenlab/viewer-releaseNat Goodspeed
2017-10-11merge changes for 5.0.8-releaseOz Linden
2017-09-27No longer 'goth windlight only', sky parameters passed from settings object.Rider Linden
2017-08-24merge changes for MAINT-7594Oz Linden
2017-08-23merge changes for MAINT-7594Oz Linden
2017-08-23merge changes for 5.0.7-releaseOz Linden
2017-08-22MAINT-7594: add platform name string to login request (and add request ↵Oz Linden
parameter logging at DEBUG)
2017-08-16merge changes for DRTVWR-439Oz Linden
2017-08-15Merged in lindenlab/viewer64-maint-7643 (pull request #17)Oz Linden
MAINT-7643 Approved-by: Oz Linden <oz@lindenlab.com> Approved-by: Nat Linden <nat@lindenlab.com>
2017-08-11MAINT-7641: Indent new RunLauncher notification per code review.Nat Goodspeed
2017-08-11MAINT-7641: Warn user if s/he directly runs viewer without launcher.Nat Goodspeed
2017-07-27MAINT-7643: add viewer bitness to crash log output, forked from V64Glenn Glazer
2017-07-27revert bad file copyGlenn Glazer
2017-07-27MAINT-7643: add viewer bitness to crash log outputGlenn Glazer
2017-06-28DRTVWR-418: Bump TEXTURE_CACHE_VERSION and INDRA_OBJECT_CACHE_VERSIONNat Goodspeed
so the Alex Ivy viewer will reset caches. We have some evidence that the cache content is tied to ADDRESS_SIZE, so asking a 64-bit viewer to process 32-bit cache content is problematic.
2017-06-20merge changes for 5.0.6-releaseOz Linden
2017-06-20pull from v64 gateGlenn Glazer
2017-06-20Merged in lindenlab/viewer-releaseAndreyL ProductEngine
2017-06-20Automated merge with ssh://bitbucket.org/lindenlab/viewer-releaseNat Goodspeed
2017-08-30MAINT-7758 Fixed freeze on loading lsl scripts from unicode named windows ↵andreykproductengine
folder.
2017-08-27Merged in oz_linden/viewer-maint-7594AndreyL ProductEngine
2017-08-25MAINT-7739 Make LLOSInfo a Singletonandreykproductengine
2017-08-24MAINT-7594: add platform name string and address size to login request for ↵Oz Linden
crash stats (and add request parameter logging at DEBUG)
2017-08-21BUG-134134 Additional loggingandreykproductengine
2017-08-10MAINT-7596 FIXED System information is truncated in JIRA issues filed ↵Mnikolenko Productengine
through "Report bug" viewer option
2017-07-13MAINT-7326 Increased default texture and vfs cache sizeandreykproductengine
2017-07-11MAINT-7554 Removed unneeded checkandreykproductengine
2017-06-27MAINT-7554 Frame throttlingandreykproductengine
2017-05-05pull from gatecoyot@coyot-sager-PC.hsd1.ca.comcast.net
2017-05-04Automated merge with ssh://bitbucket.org/lindenlab/viewer64Nat Goodspeed
2017-05-03Automated merge with ssh://bitbucket.org/lindenlab/viewer64Nat Goodspeed
2017-05-03DRTVWR-418: 64-bit Windows viewer requests "win64" updates from VVM.Nat Goodspeed
This is only transitional, until we integrate the Viewer Management Process (soon now).
2017-05-02DRTVWR-418, MAINT-6996: clarify divide-by-1024 (not shift-right 10)Nat Goodspeed
2017-05-02DRTVWR-418, MAINT-6996: Rationalize LLMemory wrt 64-bit support.Nat Goodspeed
There were two distinct LLMemory methods getCurrentRSS() and getWorkingSetSize(). It was pointless to have both: on Windows they were completely redundant; on other platforms getWorkingSetSize() always returned 0. (Amusingly, though the Windows implementations both made exactly the same GetProcessMemoryInfo() call and used exactly the same logic, the code was different in the two -- as though the second was implemented without awareness of the first, even though they were adjacent in the source file.) One of the actual MAINT-6996 problems was due to the fact that getWorkingSetSize() returned U32, where getCurrentRSS() returns U64. In other words, getWorkingSetSize() was both useless *and* wrong. Remove it, and change its one call to getCurrentRSS() instead. The other culprit was that in several places, the 64-bit WorkingSetSize returned by the Windows GetProcessMemoryInfo() call (and by getCurrentRSS()) was explicitly cast to a 32-bit data type. That works only when explicitly or implicitly (using LLUnits type conversion) scaling the value to kilobytes or megabytes. When the size in bytes is desired, use 64-bit types instead. In addition to the symptoms, LLMemory was overdue for a bit of cleanup. There was a 16K block of memory called reserveMem, the comment on which read: "reserve 16K for out of memory error handling." Yet *nothing* was ever done with that block! If it were going to be useful, one would think someone would at some point explicitly free the block. In fact there was a method freeReserve(), apparently for just that purpose -- which was never called. As things stood, reserveMem served only to *prevent* the viewer from ever using that chunk of memory. Remove reserveMem and the unused freeReserve(). The only function of initClass() and cleanupClass() was to allocate and free reserveMem. Remove initClass(), cleanupClass() and the LLCommon calls to them. In a similar vein, there was an LLMemoryInfo::getPhysicalMemoryClamped() method that returned U32Bytes. Its job was simply to return a size in bytes that could fit into a U32 data type, returning U32_MAX if the 64-bit value exceeded 4GB. Eliminate that; change all its calls to getPhysicalMemoryKB() (which getPhysicalMemoryClamped() used internally anyway). We no longer care about any platform that cannot handle 64-bit data types.
2017-04-27DRTVWR-418: Remove misleading comment -- no more implicit deleteAll().Nat Goodspeed
The comment indicates that calling LLSingletonBase::deleteAll() is optional because the LLSingleton machinery implicitly calls that during final static-object cleanup. That is no longer true.
2017-04-21Automated merge with ssh://bitbucket.org/lindenlab/viewer-releaseNat Goodspeed
2017-04-19merge changes for 5.0.4-releaseOz Linden
2017-04-19mergeBrad Payne (Vir Linden)
2017-10-06MAINT-1013 Changing YieldTime should show effects immediatelyandreykproductengine
2017-03-28MAINT-6980 FIXED Ctrl + Alt + Shift + B does not force a crash on macMnikolenko Productengine
2017-03-21SL-409 - added version field = 2 to asset stats, made viewer-side metrics ↵Brad Payne (Vir Linden)
files exactly match the payload sent to simulator.
2017-03-16merge CEF update and fixes from callumOz Linden
2017-03-14Tweak CEF plugin version to include Chrome equivalentCallum Prentice
2017-03-13DRTVWR-418: Tweak shutdown sequence to avoid resurrecting singletons.Nat Goodspeed
The LLSingletonBase::deleteAll() call late in LLAppViewer::cleanup() deletes the LLSingleton(s) used by the logging machinery, among other things. Attempting further logging after that call (such as our cheery "Goodbye!") has the unfortunate effect of attempting to resurrect the deleted LLSingleton(s). Move "Goodbye!" to just *before* the call. Also, given that call, the manual references to a couple specific LLSingletons in ~LLAppViewer() are (a) unnecessary and (b) cause attempted resurrection. Eliminate both.