Age | Commit message (Collapse) | Author | |
---|---|---|---|
2022-02-28 | Merge branch 'master' into DRTVWR-544-maint | Andrey Lihatskiy | |
# Conflicts: # indra/llaudio/llstreamingaudio_fmodstudio.cpp # indra/newview/llviewerregion.cpp | |||
2022-02-11 | SL-10190: Add menu commands to force AV or exception in coroutine. | Nat Goodspeed | |
"Bad memory access" and "unhandled exception" are the two categories of error that we expect might be different in a coroutine than in the viewer's main fiber. Without this change, we've had no reliable way to force either of those to occur. This will require translation work for two new menu items. # Conflicts: # indra/newview/skins/default/xui/en/menu_viewer.xml | |||
2022-02-11 | SL-10190: Introduce LLCoros::saveException() and rethrow(). | Nat Goodspeed | |
This mechanism uses a queue of std::exception_ptrs to transport an (otherwise) uncaught exception from a terminated coroutine to the thread's main fiber. The main loop calls LLCoros::rethrow() just after giving some cycles to ready coroutines that frame. # Conflicts: # indra/llcommon/llcoros.cpp # indra/llcommon/llcoros.h # indra/newview/llappviewer.cpp | |||
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-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-11 | SL-15083 Remove old vfs files | Mnikolenko Productengine | |
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 | |||
2022-01-10 | SL-15083 Add 'DiskCacheVersion' to keep 'filesystem cache' in check | Mnikolenko Productengine | |
2022-01-07 | Merged in SL-13297 (pull request #820) | Howard Stearns | |
SL-13297 Show both voice versions Approved-by: Andrey Kleshchev Approved-by: Andrey Lihatskiy | |||
2022-01-06 | SL-13297 - Change names to match coding standard. | Howard Stearns | |
2022-01-06 | SL-13297 - Record and use build version reported by SLVoice | Howard Stearns | |
2022-01-06 | SL-13297 - Show both server/voice versions only if mismatched. Otherwise ↵ | Howard Stearns | |
show the longer one. | |||
2022-01-06 | SL-13297 - Create LLLicenseInfo and use it in LLAppViewer::getViewerInfo and ↵ | Howard Stearns | |
LLFloaterAbout::postBuild. | |||
2021-12-20 | Merge branch 'master' into DRTVWR-544-maint | Mnikolenko Productengine | |
2021-12-16 | Merge branch 'SL-15742' into DRTVWR-527-maint | Andrey Lihatskiy | |
2021-12-15 | Merge branch 'master' into DRTVWR-530-maint | Andrey Lihatskiy | |
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-19 | Merge branch 'master' into DRTVWR-544-maint | Andrey Lihatskiy | |
# Conflicts: # indra/newview/llvoicevivox.cpp | |||
2021-11-18 | SL-16235 Restart music in case of an error | Andrey Kleshchev | |
Additional logging | |||
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-16 | Merge branch 'master' into DRTVWR-530-maint | Andrey Lihatskiy | |
# Conflicts: # doc/contributions.txt | |||
2021-11-16 | Merge branch 'master' into DRTVWR-527-maint | Andrey Lihatskiy | |
# Conflicts: # autobuild.xml # indra/newview/installers/windows/lang_pl.nsi # indra/newview/llfloaterpreference.cpp # indra/newview/llinventorymodel.cpp | |||
2021-11-09 | SL-13867 Developer ability to select and reposition multiple avatars | Andrey Kleshchev | |
2021-10-28 | SL-15462 Convert waitForChannel() into state machine | Andrey Kleshchev | |
2021-10-22 | Merge branch 'master' into DRTVWR-530-maint | Andrey Lihatskiy | |
# Conflicts: # autobuild.xml | |||
2021-10-22 | Merge branch 'master' into DRTVWR-527-maint | Andrey Lihatskiy | |
# Conflicts: # autobuild.xml | |||
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-21 | Revert "SL-11841 make ‘Push to talk’ the default setting" | Andrey Kleshchev | |
This reverts commits: 126877bc5ba45ff6b0b31368c55f894a0beaf5bf b661f62a7ad4dad9806eda8f4c8f2c9d64b3efbb ce660c7e7bb6e19a23d634fb6d3249330bf2d74c | |||
2021-09-21 | SL-11841 Fix PushToTalkToggle being set incorectly | Andrey Kleshchev | |
Due to changed defaults, legacy compatibility will no longer work corectly, remove it | |||
2021-09-18 | SL-11841 Fix PushToTalkToggle being set incorectly | Andrey Kleshchev | |
Due to changed defaults, legacy compatibility will no longer work corectly, remove it | |||
2021-09-03 | SL-15902 Cleanup gSecAPIHandler | Mnikolenko ProductEngine | |
2021-09-03 | DRTVWR-545 Megre fix | Andrey Kleshchev | |
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-09-01 | SL-15872 fixed more cases where sUseFBO wasn't updated correctly | Mnikolenko Productengine | |
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-09 | SL-15773 Don't try to remove breakpad minidump if it's not needed | Mnikolenko Productengine | |
2021-08-06 | SL-15696 Don't be so persistent with outdated driver notification | Andrey Kleshchev | |
Some manufactures provide no own updated drivers yet forbid users from updating to intel provided one | |||
2021-07-20 | DRTVWR-521 post-merge build fix | Andrey Lihatskiy | |
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-07-19 | Merge branch 'master' into DRTVWR-530-maint | Andrey Lihatskiy | |
2021-07-19 | Merge branch 'master' into DRTVWR-527-maint | Andrey Lihatskiy | |
2021-07-19 | Merge branch 'master' into DRTVWR-522-maint | Andrey Lihatskiy | |
# Conflicts: # doc/contributions.txt # indra/newview/llappcorehttp.cpp # indra/newview/llappcorehttp.h | |||
2021-06-25 | Merge branch 'master' into DRTVWR-520-apple-notarization | Andrey Lihatskiy | |