summaryrefslogtreecommitdiff
path: root/indra
AgeCommit message (Collapse)Author
2020-08-11Merge branch 'master' v6.4.7 into DRTVWR-510Dave Houlton
2020-08-10Increment viewer version to 6.4.7Nat Goodspeed
following promotion of DRTVWR-476
2020-07-31SL-13626 Fixed spelling errorAndrey Kleshchev
2020-07-30SL-13626 Fix asset storage coroutine shutdownAndrey Kleshchev
2020-07-30SL-13704 Release notes link not loading in ToolsUpdate2 releaseAndrey Kleshchev
2020-07-30Revert part of SL-11216 due to reverting VVMAndrey Kleshchev
This reverts commit 31d9930a0ff7da5a6312a8f47037052cd2d06bdb.
2020-07-24SL-13679 Event pump DupListenerName crash at loginAndrey Kleshchev
2020-07-24no-op change to trigger rebuildBrad Payne (Vir Linden)
2020-07-23DRTVWR-510, trigger new buildDave Houlton
2020-07-23no-op change to force new DRTVWR-476 buildBrad Payne (Vir Linden)
2020-07-21Merge master 6.4.6 into DRTVWR-510Dave Houlton
Includes the conversion to VS2017 build tools.
2020-07-20Increment viewer version to 6.4.6Nat Goodspeed
following promotion of DRTVWR-476
2020-07-07DRTVWR-476, SL-13555: Don't crash if user closes viewer during login.Nat Goodspeed
Ever since February 2010, the body of the login coroutine function has been enclosed in try/catch (...), with an llerrs message to try to crash more informatively than the runtime's unhandled-exception termination. Over the years this evolved to LL_ERRS and then to CRASH_ON_UNHANDLED_EXCEPTION. This persisted despite the August 2016 addition of generic catch clauses in the LLCoros::toplevel() function to serve the same purpose, and despite the subsequent introduction of the LLCoros::Stop family of exceptions to deliberately throw into waiting coroutines on viewer shutdown. That's exactly what was happening. When the user closed the viewer while waiting for the response from login.cgi, the waiting operation threw LLCoros::Stopping, which was caught by that CRASH_ON_UNHANDLED_EXCEPTION, which crashed the viewer with LL_ERRS rather than propagating up to the toplevel() and cleanly terminating the coroutine. Change CRASH_ON_UNHANDLED_EXCEPTION() to LOG_UNHANDLED_EXCEPTION() and re-throw so toplevel() can handle.
2020-07-02DRTVWR-476, SL-11430: Merge branch 'SL-9756' into d476Nat Goodspeed
2020-07-02SL-13540 Offline scripted inventory offers not shown on non drtsim-451Andrey Kleshchev
2020-07-02SL-13533: Use the old name for from_agent_nameRider Linden
SL-13540: Do not fail if binary bucket is too large, attempt to extract the asset type from the old style bucket. Notification still not shown.
2020-07-01DRTVWR-476, SL-13528: Use freopen_s() instead of assigning stderr.Nat Goodspeed
The llappviewerwin32.cpp create_console() function called by LLAppViewerWin32::initConsole() used to assign *stderr = *(new FILE* value), and so forth for stdout and stdin. That dubious tactic no longer works with the new Windows CRT introduced with VS 2015. freopen_s() works much better.
2020-07-01SL-13361: Enable color processing on Windows 10 debug console.Nat Goodspeed
(cherry picked from commit 0b61150e698537a7e42a4cdae02496da500399d9)
2020-07-01SL-13361: Distill redundant create_console() code to set_stream().Nat Goodspeed
There are separate stanzas in llappviewerwin32.cpp's create_console() function for each of STD_INPUT_HANDLE, STD_OUTPUT_HANDLE and STD_ERROR_HANDLE. SL-13361 wants to add more code to each. Factor out new local set_stream() function and make create_console() call it three times. (cherry picked from commit 13b78a0c5a788c617866e3530c65dae616e6520f)
2020-06-30DRTVWR-476: Merge branch 'SL-9756' into d476.Nat Goodspeed
2020-06-30SL-9756: Get the LLSD names right.Rider Linden
2020-06-30SL-9756: IM_TASK_INVENTORY_OFFERED bucket offline format conforms to the ↵Rider Linden
online format.
2020-06-30SL-9756: Get session_id/transaction id from aux if session is missing.Rider Linden
2020-06-30SL-11430, SL-9756: Take transaction-id from offline messages. Correct LLSD ↵Rider Linden
names. Use offline flag rather than implicit tests of session_id and aux_id.
2020-06-30SL-9756: Take the "session_id" from the offline message that was passed.Rider Linden
2020-06-26DRTVWR-476, SL-13512: Fix flawed fix for former failure.Nat Goodspeed
Specifically, llcoro::suspendUntilTimeout() is definitely called concurrently by multiple coroutines. New code that instantiates a local LLEventStream must allow the name to be tweaked for uniqueness.
2020-06-26DRTVWR-476: On Windows, request 64-bit compilerNat Goodspeed
to avoid TeamCity build failures due to 32-bit compiler running out of virtual memory for precompiled headers.
2020-06-25DRTVWR-476, SL-13512: Make suspendUntilTimeout() notice shutdown.Nat Goodspeed
Specifically, the shutdown crash reported in SL-13512 was due to LLExperienceCache::idleCoro() looping on suspendUntilTimeout(), failing to notice in its slumbers that the viewer was shutting down around it. Make suspendUntilTimeout() internally call suspendUntilEventOnWithTimeout(), which already listens for "LLApp" state-change events and throws Stopping when LLApp enters its shutdown sequence.
2020-06-23DRTVWR-476: Merge branch 'master' of lindenlab/viewer into d476Nat Goodspeed
following release of D512.
2020-06-23Merge branch 'master' 6.4.5 into DRTVWR-510Dave Houlton
2020-06-23Increment viewer version to 6.4.5Nat Goodspeed
following promotion of DRTVWR-512
2020-06-22SL-13416 eliminate sun/moon specular on shadowed surfacesDave Houlton
2020-06-19DRTVWR-476, SL-13467: Make LLTrace::BlockTimerStatHandle keys unique.Nat Goodspeed
There are duplicate LLTrace::BlockTimerStatHandle key strings declared in llsettingsdaycycle.cpp and llsettingswater.cpp -- the only instances of duplicate BlockTimerStatHandle keys in the viewer code base. SL-13467 tracks intentional crashes due to duplicate LLInstanceTracker subclass instances with one of those keys. The simplest experiment to try to eliminate those crashes is to ensure that every BlockTimerStatHandle in the code base is unique.
2020-06-19Merge branch 'master' 6.4.4 into DRTVWR-510Dave Houlton
2020-06-18SL-9632 Fix HUD objects to not use environment lightingPtolemy
2020-06-18SL-9632: Fix most HUD objects incorrectly being effected by the environment ↵Ptolemy
lighting
2020-06-18SL-13163 revert 2 more instances of 'new EEP' specular calculationDave Houlton
2020-06-16SL-13449, fix link errors for class1 soften shadersDave Houlton
2020-06-08SL-13821 shader clean up and formatDave Houlton
2020-06-08SL-13281, add missing srgb->linear conversion for specularDave Houlton
2020-06-05SL-13084: Add references to other common filesPtolemy
2020-06-05SL-13084: Move texture coords section to top in class2/windlight/cloudsV to ↵Ptolemy
match class1/deffered/cloudsV
2020-06-05SL-13084: Fix inverted cloud scroll with ALM is offPtolemy
2020-06-05SL-13804: Fix clouds flipped along East/West axis to match texture preview ↵Ptolemy
Cloud Image and direction to match Cloud Scroll
2020-06-05SL-13084: Fix clouds flipped along East/West axis to match texture preview ↵Ptolemy
Cloud Image and direction to match Cloud Scroll
2020-06-02Merge branch 'master' of https://bitbucket.org/lindenlab/viewer into DRTVWR-512Callum Prentice
2020-06-02DRTVWR-476: Merge branch 'master' of bitbucket.org:lindenlab/viewer into d476.Nat Goodspeed
2020-06-02Increment viewer version to 6.4.4Nat Goodspeed
following promotion of DRTVWR-508
2020-05-29edit-me-to-trigger-new-build.txt edited online with BitbucketDave Houlton
2020-05-28SL-13329 Misalligned checkboxes in inventory filtersAndrey Kleshchev
generated by cgit v1.2.3 (git 2.25.1) at 2024-10-12 10:17:26 +0000