summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2020-10-14Merge branch 'master' into DRTVWR-507-maintAndrey Lihatskiy
# Conflicts: # indra/newview/llfloatermodelpreview.cpp
2020-10-14Increment viewer version to 6.4.11Nat Goodspeed
following promotion of DRTVWR-482
2020-10-14SL-14081 - detail on viewer-initiated timeoutBrad Payne (Vir Linden)
2020-10-13SL-14081 - more teleport loggingBrad Payne (Vir Linden)
2020-10-12SL-13980 Crash at cullAvatarsByPixelAreaAndrey Kleshchev
LLVOAvatars and derived classes appear to be stored as LLPointer<LLViewerObject> in a lot of cases, so non-virtual ~LLViewerObject() might be triggered by LLPointer and end up not cleaning sInstances in some cases (animeshes specific?), thus causing broken pointers in sInstances.
2020-10-12SL-13830 One more crash when quiting on startup or right after teleportAndrey Kleshchev
2020-10-12SL-14093 Show the amount of saved categories and itemsMnikolenko Productengine
2020-10-09Merged in euclid-desolarisify (pull request #335)Dave Houlton
DRTVWR-510 remove all LL_SOLARIS conditional code Approved-by: Andrey Kleshchev Approved-by: Michael Pohoreski
2020-10-09SL-14081 - more detailed logging of teleport processBrad Payne (Vir Linden)
2020-10-08DRTVWR-510 remove all LL_SOLARIS conditionalsDave Houlton
2020-10-07SL-14030 FIXED Clicking in Places > My Landmarks scrolls the Places window.Mnikolenko Productengine
2020-10-01SL-14037 BugSplat Crash #646590: Enqueue failed in AISAndrey Kleshchev
2020-10-01Updated LLCA to codeticket build 549857Andrey Lihatskiy
2020-09-29Merged in DV510-merge-6.4.10 (pull request #322)Dave Houlton
Merge master v 6.4.10 to DRTVWR-510
2020-09-29SL-13500 loadShaderFile crashAndrey Kleshchev
2020-09-29Merge branch 'master' 6.4.10 into DRTVWR-510Dave Houlton
2020-09-29SL-12743 Restored the commit lost during the mergeAndrey Lihatskiy
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-24Merged in SL-13888 (pull request #317)Michael Pohoreski
SL-13888 Restore back face culling being accidently removed in SL-12781 Approved-by: Dave Houlton Approved-by: Andrey Kleshchev
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-22Merged in DV510-merge-6.4.9 (pull request #313)Dave Houlton
Merge master 6.4.9 into DRTVWR-510
2020-09-22Merge branch 'master' 6.4.9 into DRTVWR-510Dave Houlton
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.
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-04 11:04:48 +0000