Commit Graph

42910 Commits (9b511e87f5f3d52f430b89aa61860d5409469db7)

Author SHA1 Message Date
Andrey Kleshchev 9b511e87f5 SL-13560 Water reflections do not reflect everything when ALM is enabled
Contribution
2020-10-26 22:29:54 +02:00
Andrey Kleshchev f930717bac SL-13034 removeMarkerFiles() happens in destructor
Depends onto SL-13979 for proper logging
2020-10-26 21:12:54 +02:00
Andrey Kleshchev 95e724f3de SL-14004 Coalesce viewer's LLError::Settings and Globals 2020-10-26 21:04:10 +02:00
Andrey Kleshchev 802b52f304 SL-13979 Crash of logging system at LLError::Settings::getInstance()
LLSingleton depends onto logging system, having logging system be based on LLSingleton causes crashes and deadlocks
2020-10-26 20:45:26 +02:00
Mnikolenko Productengine a74cadff83 SL-14149 FIXED The text is displayed black after double-clicking on it 2020-10-23 16:05:31 +03:00
Andrey Kleshchev 701edc36f3 SL-14138 Favorites panel was not responding in some cases 2020-10-20 20:24:23 +03:00
Andrey Kleshchev 89fb672503 SL-13599 Missing bounds checks in deserializer code
Pulled in and updated Rider's changes
2020-10-19 21:46:56 +03:00
Andrey Kleshchev 1a4b66e89c SL-14136 Mistake in llfloaterpreference.cpp 2020-10-16 19:04:13 +03:00
Nat Goodspeed a2c8c8238c Increment viewer version to 6.4.11
following promotion of DRTVWR-482
2020-10-14 14:55:31 -04:00
Andrey Kleshchev 663a6dc2c3 Merged master(DRTVWR-497) into DRTVWR-482 2020-09-28 21:21:20 +03:00
Nat Goodspeed bac6652cdc Increment viewer version to 6.4.10
following promotion of DRTVWR-497
2020-09-28 13:21:32 -04:00
Andrey Kleshchev 89839721ea SL-13888 Restore back face culling being accidently removed in SL-12781
Due to conflicts picked up ptolemy's fix manually
2020-09-24 23:52:53 +03:00
Andrey Kleshchev 1ef4591381 SL-13821 Fixed checkbox not disabling 2020-09-23 12:10:06 +03:00
Dave Houlton 364ba9978b Merged in DV497-merge-6.4.9 (pull request #312)
Merge 6.4.9 into DRTVWR-497
2020-09-22 22:22:21 +00:00
Dave Houlton 86e7cc3d35 Merge branch 'master' v6.4.9 into DRTVWR-497 2020-09-22 15:28:13 -06:00
Dave Houlton b62d7c2f06 Merged in euclid-13522 (pull request #309)
SL-13522 remove injected character lights to improve alpha lighting in edit mode

Approved-by: Michael Pohoreski
2020-09-22 20:37:08 +00:00
Andrey Kleshchev 730af5d488 Merged master (DRTVWR-503) into DRTVWR-482 2020-09-22 22:51:33 +03:00
Nat Goodspeed 60ed688026 Increment viewer version to 6.4.9
following promotion of DRTVWR-503
2020-09-22 15:32:35 -04:00
Dave Houlton 5054e6abee SL-13522 remove injected character lights to improve alpha blend
Character lights injected during render pass while in character edit mode
(i.e. mSpecialRenderMode == 3) were causing discrepencies between deferred
(ALM) and forward alpha blend lighting.
2020-09-21 15:23:41 -06:00
Dave Houlton 4837def8d7 Merged in euclid-misc (pull request #305)
DRTVWR-4976 Misc shader cleanup.

Approved-by: Michael Pohoreski
2020-09-17 16:15:29 +00:00
Dave Houlton e8f4017b91 DRTVWR-4976 Misc shader cleanup.
Removed some potential div-by-0 NaNs and a mangled clamp.
2020-09-16 17:38:56 -06:00
Dave Houlton c0bbac0676 Merged in euclid-13768-b (pull request #304)
SL-13768 revisited, remove moon glow from ALM (deferred) path as well

Approved-by: Michael Pohoreski
2020-09-16 22:59:22 +00:00
Dave Houlton a5e8b6cea5 SL-13768 clang-format class2 deferred skyF.glsl (whitespace) 2020-09-16 16:47:23 -06:00
Dave Houlton 038929158c SL-13768 de-obfuscate the ALM version of skyF.glsl 2020-09-16 16:42:53 -06:00
Dave Houlton be99bca2c3 SL-13768 remove moon glow from ALM deferred path as well 2020-09-15 16:52:13 -06:00
Dave Houlton bcd2560808 Merged in drtvwr497_revert_PR297 (pull request #301)
Revert "SL-13768 Remove glow from moon when sun is down due to it using the sun glow setting (pull request #297)"
2020-09-15 21:28:29 +00:00
Dave Houlton 78da30936c Revert "SL-13768 Remove glow from moon when sun is down due to it using the sun glow setting (pull request #297)" 2020-09-15 21:25:28 +00:00
Michael Pohoreski 92f5d5428e Merged in SL-13768_remove_moon_glow (pull request #297)
SL-13768 Remove glow from moon when sun is down due to it using the sun glow setting
2020-09-12 04:11:11 +00:00
Michael Pohoreski dd875c7666 Merged in SL-13465_B (pull request #296)
SL-13465 B
2020-09-12 03:53:03 +00:00
Ptolemy 874d7e7e02 SL-13465 Restore Pre-EEP haze effecting moon 2020-09-11 20:46:55 -07:00
Ptolemy f677b4187b SL-13465 Remove hack offset of moon when AS is ON to match when AS is OFF. 2020-09-11 19:07:14 -07:00
Ptolemy d26f17efd5 SL-13768 Remove glow from moon when sun is down due to it using the sun glow setting 2020-09-11 19:01:08 -07:00
Andrey Lihatskiy 05b98ec861 Updated apr_suite to codeticket build 548882 2020-09-11 23:57:31 +03:00
Andrey Kleshchev 74f23cde48 SL-13830 Remade vivox shutdown to terminate when it is told to shutdown instead of when viewer is quiting 2020-09-11 22:10:10 +03:00
Andrey Kleshchev 6936736d17 Revert SL-13927 commit 8c8eac256b.
Got into D503 by accident
2020-09-11 21:00:20 +03:00
Andrey Kleshchev 3ab3d957de SL-13830 Don't crash if quiting during startup 2020-09-11 18:55:47 +03:00
Andrey Kleshchev 8594be3b9a SL-13927 Turn SSL verification On for all SL services in viewer 2020-09-11 16:31:15 +03:00
Andrey Kleshchev 81553d1b8c SL-13919 SSL verification should take mVerifyPeer flag into account 2020-09-09 22:09:39 +03:00
Andrey Kleshchev 4eefce9767 SL-13921 Only one of extended key usages is needed
LN (EKU_TLS) is more likely to be present thus should be checked first
2020-09-09 18:07:21 +03:00
Andrey Lihatskiy d50131c0ac Revert "SL-12475 add Inventory Favorites tab"
This reverts commit 92499ce1b4.

# Conflicts:
#	indra/newview/llinventorybridge.cpp
#	indra/newview/llinventorypanel.cpp
#	indra/newview/llinventorypanel.h
2020-09-09 01:22:18 +03:00
Andrey Lihatskiy 863eec6676 Revert "SL-12475 Mac buildfix"
This reverts commit 25fd4c2ba7.
2020-09-09 00:47:28 +03:00
Andrey Lihatskiy 3ec5970695 Merge branch 'marchcat/SL-13910' into DRTVWR-503-maint 2020-09-05 04:13:23 +03:00
Andrey Lihatskiy 786de05651 SL-13910 Moved the LLCertException constructor to .cpp 2020-09-05 00:50:39 +03:00
Andrey Lihatskiy 645393c5e9 SL-13910 Added the TLS Web Server Authentication certificate check 2020-09-04 21:29:06 +03:00
Andrey Lihatskiy 128f0833cf Updated LLCA to codeticket build 548269 2020-09-03 20:03:29 +03:00
Dave Houlton 98578ddc79 Merged in euclid-12978 (pull request #286)
SL-12978 Refactor sun intensity calculation for smooth transitions.

Approved-by: Michael Pohoreski
2020-09-02 22:21:10 +00:00
Dave Houlton 267e8fd9a3 SL-12978 & SL-13743. Remove abrupt changes in sun intensity calc, preserve original fall-off.
Had to find a balance in the sunlight intensity calculation that behaves correctly for
both these issues.
2020-09-02 15:46:33 -06:00
Dave Houlton a027e8d481 SL-12978 clang-format shader file (whitespace) 2020-09-02 15:46:33 -06:00
Dave Houlton 04eba4c3ea SL-12978 de-obfuscate, banish the temps 2020-09-02 15:46:33 -06:00
Dave Houlton 912afc940b SL-12978 refactor sunlight intensity calculation 2020-09-02 15:45:57 -06:00