summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2020-09-29SL-12743 Restored the commit lost during the mergeAndrey Lihatskiy
2020-09-28Merge branch 'master' into DRTVWR-513-maintAndrey Lihatskiy
# Conflicts: # indra/newview/llgroupmgr.cpp
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-23Fix line endingsAndrey Kleshchev
2020-09-23SL-13821 Fixed checkbox not disablingAndrey Kleshchev
2020-09-22Merged in DV497-merge-6.4.9 (pull request #312)Dave Houlton
Merge 6.4.9 into DRTVWR-497
2020-09-22Merge branch 'master' v6.4.9 into DRTVWR-497Dave Houlton
2020-09-22Merged in euclid-13522 (pull request #309)Dave Houlton
SL-13522 remove injected character lights to improve alpha lighting in edit mode Approved-by: Michael Pohoreski
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-18SL-13705 - added --deleted option to collect info on no-longer-needed text ↵Brad Payne (Vir Linden)
in translated files. Processing needs to be automated as the list is unfeasibly long.
2020-09-17Merged in euclid-misc (pull request #305)Dave Houlton
DRTVWR-4976 Misc shader cleanup. Approved-by: Michael Pohoreski
2020-09-16DRTVWR-4976 Misc shader cleanup.Dave Houlton
Removed some potential div-by-0 NaNs and a mangled clamp.
2020-09-16Merged in euclid-13768-b (pull request #304)Dave Houlton
SL-13768 revisited, remove moon glow from ALM (deferred) path as well Approved-by: Michael Pohoreski
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-16Merge branch 'SL-13705' into DRTVWR-507-maintAndrey Lihatskiy
2020-09-16SL-13705 - language list defaults to the standard supported set of FR, ES, ↵Brad Payne (Vir Linden)
IT, PT, JA, DE. '--lang all' will also use this list
2020-09-15SL-13768 remove moon glow from ALM deferred path as wellDave Houlton
2020-09-15Merged in drtvwr497_revert_PR297 (pull request #301)Dave Houlton
Revert "SL-13768 Remove glow from moon when sun is down due to it using the sun glow setting (pull request #297)"
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-15SL-13705 - added metadata tab to translation spreadsheet, showing invocation ↵Brad Payne (Vir Linden)
info
2020-09-15SL-13705 - single output file with one tab per translation languageBrad Payne (Vir Linden)
2020-09-14SL-13705 - lock all columns except C in the excel file (apparently google ↵Brad Payne (Vir Linden)
sheets does not respect this setting on import)
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-12Merged in SL-13465_B (pull request #296)Michael Pohoreski
SL-13465 B
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-11Updated apr_suite to codeticket build 548882Andrey Lihatskiy
2020-09-11SL-13705 - Additional cell/column properties specified in excel outputBrad Payne (Vir Linden)
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-11SL-13705 - quieter outputBrad Payne (Vir Linden)
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-15 05:33:12 +0000