summaryrefslogtreecommitdiff
path: root/indra/newview/viewer_manifest.py
AgeCommit message (Collapse)Author
2021-11-16Merge branch 'master' into DRTVWR-519Andrey Lihatskiy
# Conflicts: # README.md
2021-11-10SL-14403 Removed glodAndrey Kleshchev
2021-11-09SL-16320 Fix build failing due to not having any jpgsAndrey Kleshchev
2021-11-07SL-16299 Added the correct @rpath for libvlcAndrey Lihatskiy
2021-11-03SL-16299 Added entitlements for the app bundle signingAndrey Lihatskiy
2021-10-13Merge with master after latest Viewer releaseCallum Linden
2021-10-13Merge with head of Master after a new Viewer releaseCallum Prentice
2021-09-23SL-15903 SLPlugin entitlements fixAndrey Lihatskiy
2021-09-21SL-15903 Restored the lost codeAndrey Lihatskiy
2021-08-20DRTVWR-534: Batch of modifications to 360 capture project after moving from ↵Callum Prentice
internal repo to public one.
2021-08-12Merge branch 'master' into DRTVWR-520-apple-notarizationAndrey Lihatskiy
# Conflicts: # autobuild.xml # build.sh # indra/CMakeLists.txt # indra/newview/CMakeLists.txt # indra/newview/llappviewermacosx.cpp # indra/newview/llappviewerwin32.h # indra/newview/viewer_manifest.py # indra/win_crash_logger/llcrashloggerwindows.cpp
2021-08-10Merge branch 'master' into DRTVWR-519 after Viewer releaseCallum Prentice
2021-07-19Merge with Master after Viewer Release (also fixed some glaring automerge ↵Callum Prentice
screw ups)
2021-07-19Merge with tip of Master after a Viewer releaseCallum Prentice
2021-06-24SL-10297 windows local build fixAndrey Kleshchev
win_crash_logger will be fully removed in D520, for now just fixing local relwithdebinfo build
2021-06-17Fix for: SL-15422 Update version of CEF used in the Viewer to 91.0.4472.101. ↵Callum Prentice
Also includes a tweak to viewer_manifest.py to handle some CEF file changes"
2021-05-27SL-15211 Update OpenSSL libraryAndrey Kleshchev
2021-05-12SL-10297: Merge branch 'sl-10297-oz' into sl-10297.Nat Goodspeed
Bring in Oz's tweaks to the way BugSplat is engaged and tested, plus a few other miscellaneous goodies.
2021-05-01DRTVWR-520 Post-merge build fix + error handling improvementAndrey Lihatskiy
2021-04-30Merge branch 'master' into DRTVWR-520-apple-notarizationAndrey Lihatskiy
2021-04-29Clean up a merge conflictCallum Prentice
2021-04-29Merge remote-tracking branch 'origin/master' into DRTVWR-531Callum Prentice
2021-04-29DRTVWR-520 Notarize the viewer on TeamCityAndrey Lihatskiy
2021-04-27DRTVWR-520 Sign greenlet.soAndrey Lihatskiy
2021-04-27typo fixAndrey Lihatskiy
2021-04-27DRTVWR-520 SLPlugin signing and hardened runtime for viewerAndrey Lihatskiy
2021-04-26SL-15170 remove mac_crash_loggerMnikolenko ProductEngine
2021-04-23DRTVWR-520 added codesign for cef and libvlcMnikolenko ProductEngine
2021-03-17SL-14541 follow-up xcode buildfixAndrey Lihatskiy
2021-03-17SL-14541 removed breakpad, win_crash_logger, updated zlibAndrey Kleshchev
2021-03-10Merge branch 'master' into DRTVWR-531Callum Prentice
2021-03-09This set of changes reverts the merge with master (git revert c83e740) and ↵Callum Prentice
results in a version of the DRTVWR-519 that matches what was presemt before it was deployed as a release viewer *plus* 3 small fixes from Maxim (See commits). This branch can now be used for additional fixes before eventually being used to release D-519 as normal
2021-03-09Merge branch 'master' into DRTVWR-515-maintAndrey Lihatskiy
2021-03-08Revert "Merge branch 'master' of https://bitbucket.org/lindenlab/viewer into ↵Brad Payne (Vir Linden)
DRTVWR-519" This reverts commit e61f485a04dc8c8ac6bcf6a24848359092884d14, reversing changes made to 00c47d079f7e958e473ed4083a7f7691fa02dcd5.
2021-03-02Merge branch 'master' into DRTVWR-531Callum Prentice
2021-03-02Merge branch 'master' into DRTVWR-515-maintAndrey Lihatskiy
2021-02-24Pull in new version of Dullahan with support for setting the host process ↵Callum Prentice
path, tweak viewer manifest so it copies the SwiftShader folder (required but may be a Chromium bug) and improve background color matching
2021-02-03Merge with Master after Viewer releaseCallum Prentice
2021-02-01Merge branch 'master' of https://bitbucket.org/lindenlab/viewer/src/master ↵Andrey Kleshchev
into DRTVWR-515-maint # Conflicts: # autobuild.xml (llca) # indra/llwindow/llwindow.h (SL-13507 vs SL-5894) # indra/newview/llscenemonitor.cpp (SL-14422) # indra/newview/llvovolume.cpp (SL-12069)
2021-01-16SL-14597 Fixed mac library only including symlinkAndrey Kleshchev
2021-01-16SL-14597 Pulled in updated uriparserAndrey Kleshchev
Due to crash inside uriparser's code
2020-11-19SL-14012 Crashes from Win10 are sent with uninformative callstacks #2Andrey Kleshchev
2020-10-07remove the static cache files from the viewer and update viewer_manifest.py ↵Callum Prentice
to not try to copy them into the installer bundle
2020-10-06SL-14012 Crashes from Win10 are sent with uninformative callstacksAndrey Kleshchev
Simplify name generation according to slack discussion, also helps bugsplat with matching files
2020-08-25SL-10297 fix check for bugsplatOz Linden
2020-08-25SL-10297 do not package win_crash_logger executable if using BugSplatOz Linden
2020-08-24SL-10297 merged 6.4.7Oz Linden
2020-08-11Merge branch 'DRTVWR-501-maint' into DRTVWR-503-maintAndrey Lihatskiy
# Conflicts: # indra/cmake/DirectX.cmake # indra/newview/llviewerparcelmedia.cpp # indra/newview/viewer_manifest.py
2020-06-23DRTVWR-476: Merge branch 'master' of lindenlab/viewer into d476Nat Goodspeed
following release of D512.
2020-06-24Merge branch 'DRTVWR-501-maint' into DRTVWR-503-maintAndrey Lihatskiy
# Conflicts: # indra/llcommon/llkeybind.cpp # indra/llcommon/llkeybind.h