Age | Commit message (Collapse) | Author | |
---|---|---|---|
2022-08-31 | Merge branch master (DRTVWR-483) into DRTVWR-559 | Andrey Kleshchev | |
# Conflicts: # indra/newview/lllocalbitmaps.cpp # indra/newview/lllocalbitmaps.h # indra/newview/llviewerregion.cpp # lllocalgltfmaterials.* were modified to match lllocalbitmaps* | |||
2022-08-04 | Merge remote-tracking branch 'origin/master' into DRTVWR-559 | Brad Kittenbrink | |
2022-08-04 | Merge branch master (DRTVWR-561) into DRTVWR-483 | Andrey Kleshchev | |
2022-07-12 | SL-17759 Crash at LLProgressBar::draw | Andrey Kleshchev | |
mImageBar and mImageFill are specified as optional | |||
2022-06-29 | Merge branch 'master' (DRTVWR-543) into DRTVWR-559 | Andrey Kleshchev | |
# Conflicts: # autobuild.xml # indra/llrender/llgl.cpp # indra/newview/CMakeLists.txt # indra/newview/llvovolume.cpp | |||
2022-06-29 | Merge branch 'master' into DRTVWR-561-maint-O | Andrey Lihatskiy | |
2022-06-29 | Merge branch 'master' (DRTVWR-543) into DRTVWR-483 | Andrey Kleshchev | |
# Conflicts: # indra/newview/llviewertexturelist.cpp | |||
2022-06-25 | SL-17628 Added attachments can be moved past limit | Andrey Kleshchev | |
Support 'button up' when losing focus When releasing button far out of view or by refocusing something, button was not commiting. LLPanelObject last call was sendPosition(btn_down) with btn_down true which resulted in missed update. Now it will get one more call with btn_down==false. | |||
2022-06-07 | SL-15312 Fixed group names not having padding | Andrey Kleshchev | |
Plus some focus and interactibility fixes | |||
2022-05-27 | Merge branch 'master' into DRTVWR-543-maint | Andrey Lihatskiy | |
# Conflicts: # autobuild.xml # indra/cmake/LLCommon.cmake # indra/llcommon/CMakeLists.txt # indra/llrender/llgl.cpp # indra/newview/llappviewer.cpp # indra/newview/llface.cpp # indra/newview/llflexibleobject.cpp # indra/newview/llvovolume.cpp | |||
2022-05-26 | Merge branch 'master' into DRTVWR-483 | Andrey Lihatskiy | |
# Conflicts: # indra/newview/llviewertexturelist.cpp | |||
2022-04-28 | Merge remote-tracking branch 'origin/euclid-17277' into ↵ | Brad Kittenbrink | |
brad/SL-17116-material-messaging | |||
2022-04-28 | Beginning viewer side work for SL-17198 new asset and inventory types for ↵ | Brad Kittenbrink | |
Materials | |||
2022-04-28 | Add a (broken) material upload handler fxn | Dave Houlton | |
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-04-18 | Merge branch 'master' into DRTVWR-483 | Andrey Lihatskiy | |
2022-04-18 | Merge branch 'master' into DRTVWR-543-maint | Andrey Lihatskiy | |
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-483 | Andrey Lihatskiy | |
# Conflicts: # indra/newview/llviewermenu.cpp | |||
2022-02-28 | Merge branch 'master' into DRTVWR-543-maint | Andrey Lihatskiy | |
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-22 | SL-16892 Fix incorrect width of dropdown menus | Andrey Kleshchev | |
2022-01-14 | SL-16606: Add profiler category UI | Ptolemy | |
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-543-maint | Andrey Lihatskiy | |
2021-12-26 | Merge branch 'master' into DRTVWR-540-maint | Andrey Lihatskiy | |
2021-12-26 | Merge branch 'master' into DRTVWR-483 | 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-527-maint | Andrey Kleshchev | |
# Conflicts: # indra/media_plugins/cef/media_plugin_cef.cpp - setOnLoadEndCallback # indra/newview/llviewerassetstorage.cpp - mAssetCoroCount | |||
2021-11-23 | SL-16094, SL-16400: Merge branch 'DRTVWR-546' into glthread | Nat Goodspeed | |
2021-11-19 | SL-16202: Instantiate LLSimpleton::sInstance generically | Nat Goodspeed | |
instead of requiring a separate declaration for each subclass. The previous way produces errors in clang. (cherry picked from commit 8458ad8890cf0a11804996210d7bcfbdaa3eec2e) | |||
2021-11-19 | SL-16329 - track frame time and jitter (as average deviation frame to frame) ↵ | Brad Payne (Vir Linden) | |
in stats window | |||
2021-11-19 | SL-16094: Only link IMM32.LIB for llurlentry tests on Windows. | Nat Goodspeed | |
2021-11-19 | Merge branch 'master' into DRTVWR-540-maint | Andrey Lihatskiy | |
# Conflicts: # indra/newview/llfloatereditextdaycycle.cpp # indra/newview/llviewerinput.cpp | |||
2021-11-19 | Merge branch 'master' into DRTVWR-543-maint | Andrey Lihatskiy | |
# Conflicts: # indra/newview/llagentwearables.cpp # indra/newview/llvoicevivox.cpp | |||
2021-11-16 | DRTVWR-546 merge in master v6.5.1 | Dave Houlton | |
2021-11-16 | Merge branch 'master' into DRTVWR-483 | Andrey Lihatskiy | |
# Conflicts: # indra/llui/lltextbase.h # 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-15 | Revert "SL-16220: Merge branch 'origin/DRTVWR-546' into glthread" | Dave Houlton | |
This reverts commit 5188a26a8521251dda07ac0140bb129f28417e49, reversing changes made to 819088563e13f1d75e048311fbaf0df4a79b7e19. | |||
2021-11-12 | SL-16220: Merge branch 'origin/DRTVWR-546' into glthread | Nat Goodspeed | |
2021-11-10 | SL-16094: Only link IMM32.LIB for llurlentry tests on Windows. | Nat Goodspeed | |
2021-11-10 | SL-16094: Statically link to Windows IMM32.LIB. | Nat Goodspeed | |
llwindowwin32.cpp's LLWinImm class used to dynamically load IMM32.DLL and populate its methods using GetProcAddress(). That was to support Windows XP. Since we've dropped Windows XP, use static linking instead, with dramatically fewer lines of code (and less of a thread safety alarm trigger). We retain the LLWinImm wrapper class only as a hook for Tracy instrumentation. | |||
2021-11-09 | SL-16329 - track frame time and jitter (as average deviation frame to frame) ↵ | Brad Payne (Vir Linden) | |
in stats window | |||
2021-11-04 | SL-16202: Instantiate LLSimpleton::sInstance generically | Nat Goodspeed | |
instead of requiring a separate declaration for each subclass. The previous way produces errors in clang. | |||
2021-10-28 | SL-16148 SL-16244 SL-16270 SL-16253 Remove most BlockTimers, remove ↵ | Dave Parks | |
LLMemTracked, introduce alignas, hook most/all reamining allocs, disable synchronous occlusion, and convert frequently accessed LLSingletons to LLSimpleton | |||
2021-10-22 | SL-16234 FIXED Frame stall caused by unnecessary building the floater when ↵ | Mnikolenko Productengine | |
exiting viewer | |||
2021-10-22 | SL-15387 Resolve some columns crashes | Andrey Kleshchev | |
Looks like mColumnsIndexed had dead pointers which resulted in a crash and there is some kind of hard to trigger interaction with searchable UI |