Age | Commit message (Collapse) | Author | |
---|---|---|---|
2021-11-16 | Merge branch 'DRTVWR-519' into DRTVWR-552-cache-360 | Andrey Lihatskiy | |
# Conflicts: # indra/newview/app_settings/settings.xml | |||
2021-11-16 | Merge branch 'master' into DRTVWR-534 | Andrey Lihatskiy | |
# Conflicts: # indra/newview/VIEWER_VERSION.txt | |||
2021-11-16 | Merge branch 'master' into DRTVWR-519 | Andrey Lihatskiy | |
# Conflicts: # README.md | |||
2021-11-07 | SL-16299 Added the correct @rpath for libvlc | Andrey Lihatskiy | |
2021-11-03 | SL-16299 Added entitlements for the app bundle signing | Andrey Lihatskiy | |
2021-10-13 | Merge with master after latest Viewer release | Callum Linden | |
2021-10-13 | Merge with head of Master after a new Viewer release | Callum Prentice | |
2021-09-23 | SL-15903 SLPlugin entitlements fix | Andrey Lihatskiy | |
2021-09-21 | SL-15903 Restored the lost code | Andrey Lihatskiy | |
2021-08-20 | DRTVWR-534: Batch of modifications to 360 capture project after moving from ↵ | Callum Prentice | |
internal repo to public one. | |||
2021-08-12 | Merge branch 'master' into DRTVWR-520-apple-notarization | Andrey 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-10 | Merge branch 'master' into DRTVWR-519 after Viewer release | Callum Prentice | |
2021-07-19 | Merge with Master after Viewer Release (also fixed some glaring automerge ↵ | Callum Prentice | |
screw ups) | |||
2021-07-19 | Merge with tip of Master after a Viewer release | Callum Prentice | |
2021-06-24 | SL-10297 windows local build fix | Andrey Kleshchev | |
win_crash_logger will be fully removed in D520, for now just fixing local relwithdebinfo build | |||
2021-06-17 | Fix 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-27 | SL-15211 Update OpenSSL library | Andrey Kleshchev | |
2021-05-12 | SL-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-01 | DRTVWR-520 Post-merge build fix + error handling improvement | Andrey Lihatskiy | |
2021-04-30 | Merge branch 'master' into DRTVWR-520-apple-notarization | Andrey Lihatskiy | |
2021-04-29 | Clean up a merge conflict | Callum Prentice | |
2021-04-29 | Merge remote-tracking branch 'origin/master' into DRTVWR-531 | Callum Prentice | |
2021-04-29 | DRTVWR-520 Notarize the viewer on TeamCity | Andrey Lihatskiy | |
2021-04-27 | DRTVWR-520 Sign greenlet.so | Andrey Lihatskiy | |
2021-04-27 | typo fix | Andrey Lihatskiy | |
2021-04-27 | DRTVWR-520 SLPlugin signing and hardened runtime for viewer | Andrey Lihatskiy | |
2021-04-26 | SL-15170 remove mac_crash_logger | Mnikolenko ProductEngine | |
2021-04-23 | DRTVWR-520 added codesign for cef and libvlc | Mnikolenko ProductEngine | |
2021-03-17 | SL-14541 follow-up xcode buildfix | Andrey Lihatskiy | |
2021-03-17 | SL-14541 removed breakpad, win_crash_logger, updated zlib | Andrey Kleshchev | |
2021-03-10 | Merge branch 'master' into DRTVWR-531 | Callum Prentice | |
2021-03-09 | This 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-09 | Merge branch 'master' into DRTVWR-515-maint | Andrey Lihatskiy | |
2021-03-08 | Revert "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-02 | Merge branch 'master' into DRTVWR-531 | Callum Prentice | |
2021-03-02 | Merge branch 'master' into DRTVWR-515-maint | Andrey Lihatskiy | |
2021-02-24 | Pull 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-03 | Merge with Master after Viewer release | Callum Prentice | |
2021-02-01 | Merge 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-16 | SL-14597 Fixed mac library only including symlink | Andrey Kleshchev | |
2021-01-16 | SL-14597 Pulled in updated uriparser | Andrey Kleshchev | |
Due to crash inside uriparser's code | |||
2020-11-19 | SL-14012 Crashes from Win10 are sent with uninformative callstacks #2 | Andrey Kleshchev | |
2020-10-07 | remove 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-06 | SL-14012 Crashes from Win10 are sent with uninformative callstacks | Andrey Kleshchev | |
Simplify name generation according to slack discussion, also helps bugsplat with matching files | |||
2020-08-25 | SL-10297 fix check for bugsplat | Oz Linden | |
2020-08-25 | SL-10297 do not package win_crash_logger executable if using BugSplat | Oz Linden | |
2020-08-24 | SL-10297 merged 6.4.7 | Oz Linden | |
2020-08-11 | Merge branch 'DRTVWR-501-maint' into DRTVWR-503-maint | Andrey Lihatskiy | |
# Conflicts: # indra/cmake/DirectX.cmake # indra/newview/llviewerparcelmedia.cpp # indra/newview/viewer_manifest.py | |||
2020-06-23 | DRTVWR-476: Merge branch 'master' of lindenlab/viewer into d476 | Nat Goodspeed | |
following release of D512. | |||
2020-06-24 | Merge branch 'DRTVWR-501-maint' into DRTVWR-503-maint | Andrey Lihatskiy | |
# Conflicts: # indra/llcommon/llkeybind.cpp # indra/llcommon/llkeybind.h |