summaryrefslogtreecommitdiff
path: root/indra/newview
AgeCommit message (Collapse)Author
2021-05-13Revert "Merge branch 'DRTVWR-531' into DRTVWR-516-maint"Andrey Lihatskiy
This reverts commit 07456abe92ab24f373b238f6bd64087c078b7fc3, reversing changes made to 8a33636e8f56f8d1229b3f76ed6205ce8087048d.
2021-05-13Merge branch 'DRTVWR-533' into DRTVWR-516-maintAndrey Lihatskiy
2021-05-12SL-10297: Clean up a few merge glitches.Nat Goodspeed
2021-05-12SL-10297: Merge branch 'sl-10297-oz' into sl-10297.Nat Goodspeed
Bring in Oz's tweaks to the way BugSplat is engaged and tested, plus a few other miscellaneous goodies.
2021-05-12SL-15245 Multiple guide books open, but cannot close them allAndrey Kleshchev
Opening and closing single-instance floaters rapidly and multiple times could result in cleaning instance from floaterreg twice, thus removing new isntance instead of current one
2021-05-12BUG-230673: Trim asset disk cache regularlyAnsariel
2021-05-11SL-10297: Move LL_ERRS crash location into the LL_ERRS macro itself.Nat Goodspeed
Introduce Oz's LLERROR_CRASH macro analogous to the old LLError::crashAndLoop() function. Change LL_ENDL macro so that, after calling flush(), if the CallSite is for LEVEL_ERROR, we invoke LLERROR_CRASH right there. Change the meaning of LLError::FatalFunction. It used to be responsible for the actual crash (hence crashAndLoop()). Now, instead, its role is to disrupt control flow in some other way if you DON'T want to crash: throw an exception, or call exit() or some such. Any FatalFunction that returns normally will fall into the new crash in LL_ENDL. Accordingly, the new default FatalFunction is a no-op lambda. This eliminates the need to test for empty (not set) FatalFunction in Log::flush(). Remove LLError::crashAndLoop() because the official LL_ERRS crash is now in LL_ENDL. One of the two common use cases for setFatalFunction() used to be to intercept control in the last moments before crashing -- not to crash or to avoid crashing, but to capture the LL_ERRS message in some way. Especially when that's temporary, though (e.g. LLLeap), saving and restoring the previous FatalFunction only works when the lifespans of the relevant objects are strictly LIFO. Either way, that's a misuse of FatalFunction. Fortunately the Recorder mechanism exactly addresses that case. Introduce a GenericRecorder template subclass, with LLError::addGenericRecorder(callable) that accepts a callable with suitable (level, message) signature, instantiates a GenericRecorder, adds it to the logging machinery and returns the RecorderPtr for possible later use with removeRecorder(). Change llappviewer.cpp's errorCallback() to an addGenericRecorder() callable. Its role was simply to update gDebugInfo["FatalMessage"] with the LL_ERRS message, then call writeDebugInfo(), before calling crashAndLoop() to finish crashing. Remove the crashAndLoop() call, retaining the gDebugInfo logic. Pass errorCallback() to LLError::addGenericRecorder() instead of setFatalFunction(). Oddly, errorCallback()'s crashAndLoop() call was conditional on a compile-time SHADER_CRASH_NONFATAL symbol. The new mechanism provides no way to support SHADER_CRASH_NONFATAL -- it is a Bad Idea to return normally from any LL_ERRS invocation! Rename LLLeapImpl::fatalFunction() to onError(). Instead of passing it to LLError::setFatalFunction(), pass it to addGenericRecorder(). Capture the returned RecorderPtr in mRecorder, replacing mPrevFatalFunction. Then ~LLLeapImpl() calls removeRecorder(mRecorder) instead of restoring mPrevFatalFunction (which, as noted above, was order-sensitive). Of course, every enabled Recorder is called with every log message. onError() and errorCallback() must specifically test for calls with LEVEL_ERROR. LLSingletonBase::logerrs() used to call LLError::getFatalFunction(), check the return and call it if non-empty, else call LLError::crashAndLoop(). Replace all that with LLERROR_CRASH. Remove from llappviewer.cpp the watchdog_llerrs_callback() and watchdog_killer_callback() functions. watchdog_killer_callback(), passed to Watchdog::init(), used to setFatalFunction(watchdog_llerrs_callback) and then invoke LL_ERRS() -- which seems a bit roundabout. watchdog_llerrs_callback(), in turn, replicated much of the logic in the primary errorCallback() function before replicating the crash from llwatchdog.cpp's default_killer_callback(). Instead, pass LLWatchdog::init() a lambda that invokes the LL_ERRS() message formerly found in watchdog_killer_callback(). It no longer needs to override FatalFunction with watchdog_llerrs_callback() because errorCallback() will still be called as a Recorder, obviating watchdog_llerrs_callback()'s first half; and LL_ENDL will handle the crash, obviating the second half. Remove from llappviewer.cpp the static fast_exit() function, which was simply an alias for _exit() acceptable to boost::bind(). Use a lambda directly calling _exit() instead of using boost::bind() at all. In the CaptureLog class in llcommon/tests/wrapllerrs.h, instead of statically referencing the wouldHaveCrashed() function from test.cpp, simply save and restore the current FatalFunction across the LLError::saveAndResetSettings() call. llerror_test.cpp calls setFatalFunction(fatalCall), where fatalCall() was a function that simply set a fatalWasCalled bool rather than actually crashing in any way. Of course, that implementation would now lead to crashing the test program. Make fatalCall() throw a new FatalWasCalled exception. Introduce a CATCH(LL_ERRS("tag"), "message") macro that expands to: LL_ERRS("tag") << "message" << LL_ENDL; within a try/catch block that catches FatalWasCalled and sets the same bool. Change all existing LL_ERRS() in llerror_test.cpp to corresponding CATCH() calls. In fact there's also an LL_DEBUGS(bad tag) invocation that exercises an LL_ERRS internal to llerror.cpp; wrap that too.
2021-05-12SL-15168 Added 'Title' argumentAndrey Kleshchev
2021-05-12Revert "SL-15168 Changed format"Andrey Kleshchev
2021-05-11Fix for SL-15226 Simple cache viewer: Integer overflow in cache size - via ↵Callum Prentice
FS:Ansariel
2021-05-11Merge branch 'DRTVWR-531' into DRTVWR-516-maintAndrey Lihatskiy
2021-05-11SL-15249 Fix MAC build issueAndrey Kleshchev
2021-05-11SL-15249 FIXED The F1 key does not close the guidebook after clicking a linkMnikolenko Productengine
2021-05-11SL-15245 Multiple guide books open, but cannot close them allAndrey Kleshchev
"how_to" floater is supposed to be single instance
2021-05-11SL-15168 Improved uri recognitionAndrey Kleshchev
2021-05-11SL-15168 Reset title of guidebook when openingAndrey Kleshchev
2021-05-11SL-15168 Changed formatAndrey Kleshchev
instead of an url function takes an uri
2021-05-11SL-15168 Reorginized contantsAndrey Kleshchev
2021-05-10SL-15168 Mac build fixAndrey Kleshchev
2021-05-07SL-15241: Tweak viewer sources to permit compiling on Mac with C++17.Nat Goodspeed
2021-05-06SL-15168 Viewer side functionality for guidebook window opening #2Andrey Kleshchev
2021-05-06SL-15168 Viewer side functionality for guidebook window openingAndrey Kleshchev
2021-05-01Follow-up merge conflict fixAndrey Lihatskiy
2021-05-01DRTVWR-520 Post-merge build fix + error handling improvementAndrey Lihatskiy
2021-04-30SL-13395 Don't hide empty outfit foldersAndrey Kleshchev
Outfit folders can be created, managed and deleted by users, they should stay visible
2021-04-30Merge branch 'master' into DRTVWR-520-apple-notarizationAndrey Lihatskiy
2021-04-30Merge branch 'master' into DRTVWR-522-maintAndrey Lihatskiy
# Conflicts: # doc/contributions.txt
2021-04-30Merge branch 'master' into DRTVWR-521-maintAndrey Lihatskiy
2021-04-29Expose the flag to turn automatic VAD on and off. We will likely keep it ↵Callum Prentice
off since that appears to be working well for us but others may want to turn in on
2021-04-29Clean up a merge conflictCallum Prentice
2021-04-29Merge remote-tracking branch 'origin/master' into DRTVWR-531Callum Prentice
2021-04-29Merge remote-tracking branch 'origin/master' into DRTVWR-533Callum Prentice
2021-04-29restored SL-14027 (merge conflict)Andrey Kleshchev
2021-04-29Merge master (DRTVWR-515) into DRTVWR-516-maintAndrey Kleshchev
# Conflicts: # autobuild.xml # doc/contributions.txt # indra/llcommon/llcoros.cpp # indra/llmessage/llcoproceduremanager.cpp # indra/newview/llfloaterfixedenvironment.cpp # indra/newview/llfloaterimsessiontab.cpp
2021-04-29Merge master into DV525-merge-6.4.19Dave Houlton
2021-04-29Merge branch 'master' into DRTVWR-518-uiAndrey Lihatskiy
# Conflicts: # indra/newview/llfloaterfixedenvironment.cpp # indra/newview/skins/default/xui/en/strings.xml
2021-04-29Increment viewer version to 6.4.19Nat Goodspeed
following promotion of DRTVWR-515
2021-04-29DRTVWR-520 Safety check; remove temporary zip fileAndrey Lihatskiy
2021-04-29buildfix (chmod a+x)Andrey Lihatskiy
2021-04-29DRTVWR-520 Notarize the viewer on TeamCityAndrey Lihatskiy
2021-04-28After a small but successful test at our standup, we're going to make the ↵Callum Prentice
default value for the VAD sensitivity 0 (off). The settings can all still be changed via Debug variables but this seems like a sensible starting point for the next test.
2021-04-28SL-15181 Crash at LLSkinningUtil::initSkinningMatrixPaletteAndrey Kleshchev
2021-04-28SL-15174 set Starting Guidebook location on-screenMnikolenko Productengine
2021-04-27DRTVWR-520 Sign greenlet.soAndrey Lihatskiy
2021-04-27typo fixAndrey Lihatskiy
2021-04-27DRTVWR-520 SLPlugin signing and hardened runtime for viewerAndrey Lihatskiy
2021-04-26SL-15170 remove mac_crash_loggerMnikolenko ProductEngine
2021-04-23SL-14842 Tooltip for clear historyAndrey Kleshchev
2021-04-23SL-14956 Fix landmarks sometimes staying in mLoadedCallbackMap #2Andrey Kleshchev
Improved fix
2021-04-23DRTVWR-520 added codesign for cef and libvlcMnikolenko ProductEngine
generated by cgit v1.2.3 (git 2.25.1) at 2024-10-09 17:18:52 +0000