Age | Commit message (Collapse) | Author | |
---|---|---|---|
2022-06-09 | tinygltf updated with new public build for SL-17214 | Brad Kittenbrink | |
2022-06-08 | SL-17214 add 3p-tinygltf dependency to autobuild.xml | Dave Houlton | |
2022-05-20 | SL-17287 Update Tracy to 0.8.1. Clean up GPU instrumentation. | Dave Parks | |
2022-05-16 | SL-17284 Reflection probe tuning and optimization take 1 | Dave Parks | |
2022-04-18 | Merge branch master (D540) into DRTVWR-546 | Andrey Kleshchev | |
# Conflicts: # indra/llcommon/llsdutil.cpp # indra/newview/VIEWER_VERSION.txt # indra/newview/lldrawpoolalpha.cpp # indra/newview/lldrawpoolwater.cpp | |||
2022-03-28 | SL-17079: Merge 'sl-17079' into DRTVWR-546 for Mac updater fix. | Nat Goodspeed | |
2022-03-28 | SL-17079: Merge 'sl-17079' into DRTVWR-540-maint for updater fix. | Nat Goodspeed | |
2022-03-25 | SL-17079: Update to viewer-manager build 569958 | Nat Goodspeed | |
2022-03-01 | Merge branch 'master' (DRTVWR-557) into DRTVWR-546 | Andrey Kleshchev | |
# Conflicts: # autobuild.xml # doc/contributions.txt # indra/cmake/GLOD.cmake # indra/llcommon/tests/llprocess_test.cpp # indra/newview/VIEWER_VERSION.txt # indra/newview/lldrawpoolavatar.cpp # indra/newview/llfloatermodelpreview.cpp # indra/newview/llmodelpreview.cpp # indra/newview/llviewertexturelist.cpp # indra/newview/llvovolume.cpp # indra/newview/viewer_manifest.py | |||
2022-02-28 | Merge branch 'master' into DRTVWR-540-maint | Andrey Lihatskiy | |
# Conflicts: # autobuild.xml # indra/llcommon/llsys.cpp # indra/newview/app_settings/key_bindings.xml # indra/newview/llfloatereditextdaycycle.cpp | |||
2022-02-15 | SL-16842, SL-14300: Merge branch 'DRTVWR-555' into DRTVWR-553-555 | Nat Goodspeed | |
2022-02-15 | SL-16842, SL-14300: Update to viewer-manager build 568552 | Nat Goodspeed | |
2022-02-11 | SL-16842: Merge 'DRTVWR-555' into DRTVWR-553-555 for updater fix. | Nat Goodspeed | |
2022-02-11 | SL-16842: Update to viewer-manager build 568451 | Nat Goodspeed | |
2022-02-08 | SL-13792: Merge branch 'DRTVWR-555' into DRTVWR-553-555. | Nat Goodspeed | |
This picks up the change to 32-bit Windows viewer-manager. | |||
2022-02-08 | DRTVWR-555: Update to viewer-manager build 568310 | Nat Goodspeed | |
2022-02-08 | Merge branch 'DRTVWR-555' into DRTVWR-553+555 | Andrey Lihatskiy | |
# Conflicts: # autobuild.xml # indra/newview/llappviewer.cpp # indra/newview/viewer_manifest.py | |||
2022-02-04 | SL-16788: Update to viewer-manager build 568156 | Nat Goodspeed | |
2022-02-04 | SL-16787 Updater launch issues. | Andrey Kleshchev | |
2022-02-02 | SL-13792: Update to viewer-manager build 568036 | Nat Goodspeed | |
2022-02-01 | SL-13792: Update to viewer-manager build 568005 | Nat Goodspeed | |
2022-02-01 | SL-13792: Update to viewer-manager build 567997 | Nat Goodspeed | |
2022-02-01 | DRTVWR-540 Updated LLCA to CT build 567974 | Andrey Lihatskiy | |
2022-01-31 | SL-13792: Use new Python 3 SLVersionChecker. | Nat Goodspeed | |
On Mac, execute the packaged SLVersionChecker directly rather than invoking system Python on our manually-bundled scripts. | |||
2022-01-13 | Merge branch 'DRTVWR-542-meshopt' into DRTVWR-546 | Andrey Kleshchev | |
Final merge of DRTVWR-542 into DRTVWR-546, this only picks up a merge fix for updater. | |||
2022-01-11 | DRTVWR-533 Updated LLCA to CT build 567162 | Andrey Lihatskiy | |
2022-01-10 | Merge branch 'DRTVWR-530-maint' into DRTVWR-553-maint-mix-JK | Andrey Lihatskiy | |
# Conflicts: # indra/newview/app_settings/key_bindings.xml # indra/newview/llappviewer.cpp # indra/newview/llkeyconflict.cpp | |||
2021-12-26 | Merge branch 'master' into DRTVWR-540-maint | Andrey Lihatskiy | |
2021-12-16 | Merge branch 'SL-15742' into DRTVWR-527-maint | Andrey Lihatskiy | |
2021-12-15 | DRTVWR-546 merge up to 6.5.2 | Dave Houlton | |
2021-12-15 | Merge branch 'master' into DRTVWR-530-maint | Andrey Lihatskiy | |
2021-12-15 | Merge branch master (DRTVWR-552) into DRTVWR-542-meshopt | Andrey Kleshchev | |
+resolved viewer-manager's inherited conflict | |||
2021-12-15 | updated viewer-manager after merge | Andrey Kleshchev | |
2021-12-15 | Merge branch 'master' (DRTVWR-552) into DRTVWR-527-maint | Andrey Kleshchev | |
# Conflicts: # indra/media_plugins/cef/media_plugin_cef.cpp - setOnLoadEndCallback # indra/newview/llviewerassetstorage.cpp - mAssetCoroCount | |||
2021-12-11 | Merge branch 'master' into SL-15742 | Bennett Goble | |
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-29 | SL-16396 Updater fails with "takes exactly 3 arguments" error | Andrey Kleshchev | |
2021-11-29 | Merge branch 'DRTVWR-542-meshopt' into DRTVWR-546 | Andrey Kleshchev | |
2021-11-23 | SL-16396 Updater fails with "takes exactly 3 arguments" error | Andrey Kleshchev | |
2021-11-19 | Merge branch 'master' into DRTVWR-540-maint | Andrey Lihatskiy | |
# Conflicts: # indra/newview/llfloatereditextdaycycle.cpp # indra/newview/llviewerinput.cpp | |||
2021-11-18 | SL-16235 Update fmod to 2.02.03 | Andrey Kleshchev | |
2021-11-16 | DRTVWR-546 merge in master v6.5.1 | Dave Houlton | |
2021-11-16 | Merge branch master (DRTVWR-545) into DRTVWR-542-meshopt | Andrey Kleshchev | |
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-530-maint | Andrey Lihatskiy | |
# Conflicts: # doc/contributions.txt | |||
2021-11-12 | SL-15333 Crash in glh_init_extensions | Andrey Kleshchev | |
2021-11-10 | SL-14403 Removed glod | Andrey Kleshchev | |
2021-11-04 | SL-16299 Updated dullahan to CT build 565428; entitlements cleanup | Andrey Lihatskiy | |
2021-11-02 | Manually resolving conflicts after merge with DRTVWR-520 | Andrey Kleshchev | |
This reverts commit 0a745b47880fb16b1db8cd3327377a383dbfe6a8. | |||
2021-11-02 | Merge remote-tracking branch 'origin/master' into DRTVWR-540-maint | Andrey Kleshchev | |
# Conflicts: # autobuild.xml # indra/newview/CMakeLists.txt # indra/newview/installers/darwin/apple-notarize.sh # indra/newview/llappviewermacosx.cpp # indra/newview/llappviewerwin32.h # indra/newview/viewer_manifest.py # indra/win_crash_logger/llcrashloggerwindows.cpp |