summaryrefslogtreecommitdiff
path: root/indra
AgeCommit message (Collapse)Author
2020-09-28Merge branch 'master' into DRTVWR-507-maintAndrey Lihatskiy
# Conflicts: # indra/newview/pipeline.cpp
2020-09-28Merged master(DRTVWR-497) into DRTVWR-482Andrey Kleshchev
2020-09-28Increment viewer version to 6.4.10Nat Goodspeed
following promotion of DRTVWR-497
2020-09-26SL-14007 Group icon in "About land" displays wrong iconAndrey Kleshchev
2020-09-25SL-13132 Fixed missing 'owner' labelAndrey Kleshchev
2020-09-25SL-13034 Last string in logs should say 'Goodbye'Andrey Kleshchev
These logs were not logging for very long due to supressed logging system, no point showing them now
2020-09-25SL-13034 removeMarkerFiles() happens in destructorAndrey Kleshchev
Depends onto SL-13979 for proper logging
2020-09-25post-merge cleanupAndrey Lihatskiy
2020-09-25SL-13873 update copyright date to 2020Mnikolenko Productengine
2020-09-25SL-12962 rename remained stringsMnikolenko Productengine
2020-09-25SL-13979 Crash of logging system at LLError::Settings::getInstance()Andrey Kleshchev
LLSingleton depends onto logging system, having logging system be based on LLSingleton causes crashes and deadlocks
2020-09-24SL-13888 Restore back face culling being accidently removed in SL-12781Andrey Kleshchev
Due to conflicts picked up ptolemy's fix manually
2020-09-24SL-13888 Coding Standard: be consistent; use TAB indentPtolemy
2020-09-24SL-13888 Restore back face culling being accidently removed in SL-12781Ptolemy
2020-09-23Fix line endingsAndrey Kleshchev
2020-09-23SL-13821 Fixed checkbox not disablingAndrey Kleshchev
2020-09-22Merge branch 'master' 6.4.9 into DRTVWR-510Dave Houlton
2020-09-22Merge branch 'master' v6.4.9 into DRTVWR-497Dave Houlton
2020-09-22follow-up build fixAndrey Lihatskiy
2020-09-22Merge branch 'master' into DRTVWR-507-maintAndrey Lihatskiy
# Conflicts: # doc/contributions.txt # indra/newview/llfloaterconversationpreview.cpp # indra/newview/llinventorypanel.h # indra/newview/llmeshrepository.h # indra/newview/llvoicevivox.cpp
2020-09-22Merged master (DRTVWR-503) into DRTVWR-482Andrey Kleshchev
2020-09-22Increment viewer version to 6.4.9Nat Goodspeed
following promotion of DRTVWR-503
2020-09-21SL-13522 remove injected character lights to improve alpha blendDave Houlton
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-22SL-13978 Logout crash at LLParamSingleton<LLUI>Andrey Kleshchev
Notifications were cleaned up by this point and were pulling in LLUI
2020-09-21SL-13697 Items I am wearing continue to go to lost and foundAndrey Kleshchev
Contribution from Ansariel Hiller
2020-09-18SL-13733 Crash: Do not unassign event handler before handling WM_DESTROYAndrey Kleshchev
2020-09-16DRTVWR-4976 Misc shader cleanup.Dave Houlton
Removed some potential div-by-0 NaNs and a mangled clamp.
2020-09-16SL-13768 clang-format class2 deferred skyF.glsl (whitespace)Dave Houlton
2020-09-16SL-13768 de-obfuscate the ALM version of skyF.glslDave Houlton
2020-09-15SL-13768 remove moon glow from ALM deferred path as wellDave Houlton
2020-09-15Revert "SL-13768 Remove glow from moon when sun is down due to it using the ↵Dave Houlton
sun glow setting (pull request #297)"
2020-09-12Merged in SL-13768_remove_moon_glow (pull request #297)Michael Pohoreski
SL-13768 Remove glow from moon when sun is down due to it using the sun glow setting
2020-09-11SL-13465 Restore Pre-EEP haze effecting moonPtolemy
2020-09-11SL-13465 Remove hack offset of moon when AS is ON to match when AS is OFF.Ptolemy
2020-09-11SL-13768 Remove glow from moon when sun is down due to it using the sun glow ↵Ptolemy
setting
2020-09-11SL-13830 Remade vivox shutdown to terminate when it is told to shutdown ↵Andrey Kleshchev
instead of when viewer is quiting
2020-09-11Revert SL-13927 commit 8c8eac256bdb51fdf9e6e297280b2017d26c3588.Andrey Kleshchev
Got into D503 by accident
2020-09-11SL-13830 Don't crash if quiting during startupAndrey Kleshchev
2020-09-11SL-13927 Turn SSL verification On for all SL services in viewerAndrey Kleshchev
2020-09-09SL-13919 SSL verification should take mVerifyPeer flag into accountAndrey Kleshchev
2020-09-09SL-13921 Only one of extended key usages is neededAndrey Kleshchev
LN (EKU_TLS) is more likely to be present thus should be checked first
2020-09-09Revert "SL-12475 add Inventory Favorites tab"Andrey Lihatskiy
This reverts commit 92499ce1b43fd60ce7aad71d12f9eef0cef04f7f. # Conflicts: # indra/newview/llinventorybridge.cpp # indra/newview/llinventorypanel.cpp # indra/newview/llinventorypanel.h
2020-09-09Revert "SL-12475 Mac buildfix"Andrey Lihatskiy
This reverts commit 25fd4c2ba7bc00a0603bf58f5897ac550ff02446.
2020-09-05Merge branch 'marchcat/SL-13910' into DRTVWR-503-maintAndrey Lihatskiy
2020-09-05SL-13910 Moved the LLCertException constructor to .cppAndrey Lihatskiy
2020-09-04SL-13910 Added the TLS Web Server Authentication certificate checkAndrey Lihatskiy
2020-09-02SL-12978 & SL-13743. Remove abrupt changes in sun intensity calc, preserve ↵Dave Houlton
original fall-off. Had to find a balance in the sunlight intensity calculation that behaves correctly for both these issues.
2020-09-02SL-12978 clang-format shader file (whitespace)Dave Houlton
2020-09-02SL-12978 de-obfuscate, banish the tempsDave Houlton
2020-09-02SL-12978 refactor sunlight intensity calculationDave Houlton
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-12 16:24:20 +0000