Commit Graph

42499 Commits (2fb998bc02f3d8a7e0753b5d34db2c13dc70e212)

Author SHA1 Message Date
Dave Houlton 2fb998bc02 Merge branch 'master' v6.4.7 into DRTVWR-510 2020-08-11 11:14:21 -06:00
Nat Goodspeed 89cde15fb8 Increment viewer version to 6.4.7
following promotion of DRTVWR-476
2020-08-10 16:51:50 -04:00
Andrey Kleshchev e8422ec9d7 SL-13626 Fixed spelling error 2020-07-31 00:14:14 +03:00
Andrey Kleshchev 135a85ec62 SL-13626 Fix asset storage coroutine shutdown 2020-07-30 21:07:35 +03:00
Andrey Kleshchev 8103d13047 SL-13704 Release notes link not loading in ToolsUpdate2 release 2020-07-30 14:43:27 +03:00
Andrey Kleshchev 6bafe47e5c Revert part of SL-11216 due to reverting VVM
This reverts commit 31d9930a0f.
2020-07-30 14:36:39 +03:00
Andrey Kleshchev 77f5a06a1e SL-13688 Reverted viewer-manager to pre-tools build 2020-07-27 20:33:52 +03:00
Andrey Kleshchev cca777fdf5 SL-13679 Event pump DupListenerName crash at login 2020-07-24 23:53:57 +03:00
Brad Payne (Vir Linden) b107e9218a no-op change to trigger rebuild 2020-07-24 21:46:49 +01:00
Dave Houlton 38e585f5be DRTVWR-510, trigger new build 2020-07-23 11:22:10 -06:00
Brad Payne (Vir Linden) 0e62a92a7d no-op change to force new DRTVWR-476 build 2020-07-23 16:39:17 +01:00
Dave Houlton 8153e7d639 Merged in merge-6.4.6 (pull request #207)
Merge master 6.4.6 into DRTVWR-510 (VS2017 update)
2020-07-21 20:11:56 +00:00
Dave Houlton 19d063952c Merge master 6.4.6 into DRTVWR-510
Includes the conversion to VS2017 build tools.
2020-07-21 11:04:56 -06:00
Nat Goodspeed 72423372d6 Increment viewer version to 6.4.6
following promotion of DRTVWR-476
2020-07-20 15:04:30 -04:00
Nat Goodspeed 87da08b1f4 DRTVWR-476, SL-13555: Don't crash if user closes viewer during login.
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-07 14:48:36 -04:00
Nat Goodspeed 5ab0ff486b DRTVWR-476, SL-11430: Merge branch 'SL-9756' into d476 2020-07-02 13:24:29 -04:00
Andrey Kleshchev bf5585c0ec SL-13540 Offline scripted inventory offers not shown on non drtsim-451 2020-07-02 19:05:12 +03:00
Rider Linden 766b21a0a6 SL-13533: Use the old name for from_agent_name
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-02 19:05:12 +03:00
Nat Goodspeed 01128f9f94 DRTVWR-476, SL-13528: Use freopen_s() instead of assigning stderr.
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-01 16:29:59 -04:00
Nat Goodspeed d8649dbb8a SL-13361: Enable color processing on Windows 10 debug console.
(cherry picked from commit 0b61150e69)
2020-07-01 13:38:05 -04:00
Nat Goodspeed 4708662091 SL-13361: Distill redundant create_console() code to set_stream().
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 13b78a0c5a)
2020-07-01 13:33:29 -04:00
Nat Goodspeed a075a73920 DRTVWR-476: Merge branch 'SL-9756' into d476. 2020-06-30 16:59:17 -04:00
Rider Linden 01f2308c85 SL-9756: Get the LLSD names right. 2020-06-30 23:13:05 +03:00
Rider Linden f72759c16d SL-9756: IM_TASK_INVENTORY_OFFERED bucket offline format conforms to the online format. 2020-06-30 23:13:05 +03:00
Rider Linden f8e53adce7 SL-9756: Get session_id/transaction id from aux if session is missing. 2020-06-30 23:13:04 +03:00
Rider Linden c8b7466c19 SL-11430, SL-9756: Take transaction-id from offline messages. Correct LLSD names. Use offline flag rather than implicit tests of session_id and aux_id. 2020-06-30 23:13:04 +03:00
Rider Linden e2dd15397c SL-9756: Take the "session_id" from the offline message that was passed. 2020-06-30 23:13:04 +03:00
Nat Goodspeed 75b5f72e69 DRTVWR-476, SL-13512: Fix flawed fix for former failure.
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-26 14:40:07 -04:00
Nat Goodspeed e7d3b7cc93 DRTVWR-476: On Windows, request 64-bit compiler
to avoid TeamCity build failures due to 32-bit compiler running out of virtual
memory for precompiled headers.
2020-06-26 11:16:38 -04:00
Nat Goodspeed 1231cb4585 DRTVWR-476, SL-13512: Make suspendUntilTimeout() notice shutdown.
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-25 20:59:04 -04:00
Nat Goodspeed e83613157b DRTVWR-476: Update to dullahan build 544091 2020-06-24 12:03:28 -04:00
Nat Goodspeed b594b05b0a DRTVWR-476: Update to dullahan build 544081 2020-06-24 09:16:00 -04:00
Nat Goodspeed 80ef11de71 DRTVWR-476: Update to dullahan build 544068 2020-06-23 22:06:21 -04:00
Nat Goodspeed 77cf4588df DRTVWR-476: Merge branch 'master' of lindenlab/viewer into d476
following release of D512.
2020-06-23 22:03:43 -04:00
Dave Houlton 6362aa3007 Merged in merge-6.4.5 (pull request #170)
Merge master 6.4.5 into DRTVWR-510
2020-06-24 01:19:28 +00:00
Dave Houlton cb9ce206a9 Merge branch 'master' 6.4.5 into DRTVWR-510 2020-06-23 16:20:34 -06:00
Nat Goodspeed c0087286e7 Increment viewer version to 6.4.5
following promotion of DRTVWR-512
2020-06-23 16:52:36 -04:00
Dave Houlton bad9314c30 Merged in euclid-13416 (pull request #169)
SL-13416 eliminate sun/moon specular on shadowed surfaces

Approved-by: Michael Pohoreski
2020-06-22 21:27:52 +00:00
Dave Houlton 0e3e3db40e SL-13416 eliminate sun/moon specular on shadowed surfaces 2020-06-22 14:43:41 -06:00
Dave Houlton 5df284b23a Merged in merge-6.4.4 (pull request #167)
Merge master 6.4.4 into DRTVWR-510
2020-06-19 17:18:18 +00:00
Nat Goodspeed f627140cf1 DRTVWR-476, SL-13467: Make LLTrace::BlockTimerStatHandle keys unique.
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-19 12:33:15 -04:00
Dave Houlton ba6a0f3f33 Merge branch 'master' 6.4.4 into DRTVWR-510 2020-06-19 10:18:56 -06:00
Michael Pohoreski b84e79e0f2 Merged in SL-9632 (pull request #164)
SL-9632

Approved-by: Dave Houlton
2020-06-18 23:56:59 +00:00
Ptolemy 7f9765a41c SL-9632 Fix HUD objects to not use environment lighting 2020-06-18 15:16:48 -07:00
Ptolemy b490a59ce2 SL-9632: Fix most HUD objects incorrectly being effected by the environment lighting 2020-06-18 15:16:48 -07:00
Dave Houlton c11a6df536 Merged in euclid-13163 (pull request #161)
SL-13163, fix additional instances of too weak solar/lunar specular reflectance

Approved-by: Michael Pohoreski
2020-06-18 19:09:08 +00:00
Dave Houlton aa5bd5d6f5 SL-13163 revert 2 more instances of 'new EEP' specular calculation 2020-06-18 09:56:52 -06:00
Dave Houlton 092537cd48 Merged in euclid-13449 (pull request #160)
SL-13449, fix link errors for class1 soften shaders
2020-06-17 18:31:36 +00:00
Dave Houlton c5f00ab478 SL-13449, fix link errors for class1 soften shaders 2020-06-16 18:22:35 -06:00
Dave Houlton 0af856ce9f Merged in euclid-SL13281 (pull request #141)
Fix missing srgb conversion for deferred point light specularity
2020-06-09 00:06:59 +00:00