Age | Commit message (Collapse) | Author | |
---|---|---|---|
2021-12-16 | Merge branch 'SL-15742' into DRTVWR-527-maint | Andrey Lihatskiy | |
2021-12-10 | SL-15742: Convert build scripts to Python 3 | Bennett Goble | |
This changeset makes it possible to build the Second Life viewer using Python 3. It is designed to be used with an equivalent Autobuild branch so that a developer can compile without needing Python 2 on their machine. Breaking change: Python 2 support ending Rather than supporting two versions of Python, including one that was discontinued at the beginning of the year, this branch focuses on pouring future effort into Python 3 only. As a result, scripts do not need to be backwards compatible. This means that build environments, be they on personal computers and on build agents, need to have a compatible interpreter. Notes - SLVersionChecker will still use Python 2 on macOS - Fixed the message template url used by template_verifier.py | |||
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-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-10-14 | Merge branch 'master' into DRTVWR-545-maint-mix | Andrey Lihatskiy | |
2021-09-28 | Revert "Merge branch 'c++17' into DRTVWR-522-maint" | Andrey Lihatskiy | |
This reverts commit 203ea3a70a775a09cbbffb1740ab7c58f1780baa, reversing changes made to 8e3f0778863a5aa337d1148a243ea91d238a8ac5. # Conflicts: # indra/newview/llmachineid.cpp | |||
2021-09-03 | Merge branch 'DRTVWR-522-maint' into DRTVWR-545-maint-mix | Andrey Lihatskiy | |
# Conflicts: # indra/newview/llappviewer.cpp # indra/newview/llappviewerwin32.cpp # indra/newview/llmachineid.cpp | |||
2021-08-27 | Merge branch 'c++17' into DRTVWR-522-maint | 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-07-20 | Merge branch 'master' into DRTVWR-521-maint | Andrey Lihatskiy | |
# Conflicts: # autobuild.xml # indra/llcommon/llerror.cpp # indra/llui/llnotifications.h # indra/newview/llappviewer.cpp # indra/newview/llappviewermacosx.cpp | |||
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-05-27 | SL-15211 Update OpenSSL library | Andrey Kleshchev | |
2021-05-13 | SL-10297: Need VS switch /std:c++17 to use std::string_view. | Nat Goodspeed | |
(cherry picked from commit 28deadab5b37880314a58eff095ae2844a9ebbac) | |||
2021-05-12 | SL-10297: Revert "Need VS switch /std:c++17 to use std::string_view." | Nat Goodspeed | |
This reverts commit 28deadab5b37880314a58eff095ae2844a9ebbac. Going there implies other changes, will take up on another branch. | |||
2021-05-12 | SL-10297: Need VS switch /std:c++17 to use std::string_view. | Nat Goodspeed | |
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-07 | SL-15241: Tweak viewer sources to permit compiling on Mac with C++17. | Nat Goodspeed | |
2021-04-30 | Merge branch 'master' into DRTVWR-520-apple-notarization | Andrey Lihatskiy | |
2021-04-30 | Merge branch 'master' into DRTVWR-521-maint | Andrey Lihatskiy | |
2021-04-29 | Clean up a merge conflict | Callum Prentice | |
2021-04-09 | Xcode12 linking fix (CEF) | Andrey Lihatskiy | |
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-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-521-maint | Andrey Lihatskiy | |
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-521-maint | Andrey Lihatskiy | |
2021-03-02 | Merge branch 'master' into DRTVWR-515-maint | Andrey Lihatskiy | |
2021-01-16 | SL-14597 Fixed mac library only including symlink | Andrey Kleshchev | |
2021-01-16 | SL-14597 Updated Mac library name | Andrey Kleshchev | |
2021-01-16 | SL-14597 Pulled in updated uriparser | Andrey Kleshchev | |
Due to crash inside uriparser's code | |||
2021-01-15 | SL-13313 Update links to master message_template.msg | Mnikolenko Productengine | |
2020-10-06 | Remove SQLite from project and we are now not going to use it for the cache | Callum Prentice | |
2020-09-28 | Merge with tip of Release | Callum Prentice | |
2020-09-22 | Add SQLite third package to this viewer and pull in the most recent build (3.33) | Callum Prentice | |
2020-09-22 | Merge branch 'master' v6.4.9 into DRTVWR-497 | Dave Houlton | |
2020-09-22 | Merge branch 'master' into DRTVWR-519 | Callum Prentice | |
2020-09-17 | The folder where the disk cache lives was originally renamed from llvfs to ↵ | Callum Prentice | |
llcache but @henri's suggestion that that doesn't reflect the other files in the same place and it should be llfilesystem is a good one so I changed it over | |||
2020-09-16 | First part of change to remove LLVFS from the Viewer. Consists of code ↵ | Callum Prentice | |
changes to remove LLVFS and LLVFSThread classes along with the associated source files. The existing llvfs folder is renamed to llcache. Also includes changes to CMake script in many places to reflect changes. Eventually, llvfile source file and class will be renamed but that is not in this change. | |||
2020-09-11 | Effective rename of DRTVWR-506-simple since there is no way to rename a ↵ | Callum Prentice | |
branch. Cloned canonical viewer into DRTVWR-519, copied over the files that changed from DRTVWR-506-simple and pushed back. Once I am satisfied everything is correct, DRTVWR-506-simple will be removed | |||
2020-08-24 | DRTVWR-497 restore parallel builds for x64 VS2017 | Dave Houlton | |
2020-08-24 | SL-10297 merged 6.4.7 | Oz Linden | |
2020-08-21 | Small change to CMake options to only enable the ↵ | Callum Prentice | |
PreferredToolArchitecture=x64 option (required for 32bit TeamCity builds) on 32 bit builds generally - removes a ton of 'unknown option, ignored' spam in the build output | |||
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 |