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-30 | Merge remote-tracking branch 'remotes/origin/DRTVWR-563' into DRTVWR-559 | Dave Parks | |
2022-08-08 | SL-17927 Keep people from shooting themselves in the foot by twiddling ↵ | Dave Parks | |
deprecated settings. | |||
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-06-30 | SL-17668 Add operation "show in inventory" on in-world avatar attachment | Mnikolenko Productengine | |
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' (DRTVWR-543) into DRTVWR-483 | Andrey Kleshchev | |
# Conflicts: # indra/newview/llviewertexturelist.cpp | |||
2022-06-09 | SL-17573 Add "dynamic" checkbox, also followup on SL-17551 and do "Select ↵ | Dave Parks | |
Invisible Objects" checkbox instead of "Select Reflection Probes" | |||
2022-06-09 | SL-17551 Add "Select Reflection Probes" menu option and make invisible ↵ | Dave Parks | |
objects less annoying when alt-zooming in edit mode. | |||
2022-06-08 | SL-17214 initial loader class skeleton | Dave Houlton | |
2022-05-31 | SL-17490 Only update a subset of textures each frame and remove dead debug code. | Dave Parks | |
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-05-16 | SL-17284 Reflection probe tuning and optimization take 1 | Dave Parks | |
2022-04-28 | SL-17281 environment map prototype (stupid slow and hacky, but provides a ↵ | Dave Parks | |
way to get a "real" environment map for shader development) | |||
2022-03-02 | DRTVWR-483 Post-merge fix - restored the lost code | 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-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-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-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-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-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-10-28 | SL-9436 Don't render 100% transparent objects. | Dave Parks | |
2021-10-08 | SL-16118 FIXED First item can't be sent to Marketplace through right-click menu | Mnikolenko Productengine | |
2021-09-28 | SL-16098 Unable to sit on an object using the 'Object inspector' floater | Andrey Kleshchev | |
The same should probably be done for onClickTouch | |||
2021-09-27 | SL-16085 FIXED "Reset skeleton and animation" isn't reset the animation on ↵ | Mnikolenko Productengine | |
the avatar without selecting part of the avatar | |||
2021-09-11 | SL-15964 Simple test for compression library | Andrey Kleshchev | |
2021-09-11 | SL-15964 Simple test for compression library | 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-08-20 | DRTVWR-534: Batch of modifications to 360 capture project after moving from ↵ | Callum Prentice | |
internal repo to public one. | |||
2021-07-30 | SL-15729 Using gMenuLand instead of gMenuHolder | Andrey Kleshchev | |
These UI elements belong to gMenuLand, "Buy Land..." no longer exists | |||
2021-07-30 | SL-15729 Crash calling childSetEnabled | Andrey Kleshchev | |
2021-07-23 | Merge branch 'master' into DRTVWR-483 | Andrey Lihatskiy | |
# Conflicts: # indra/newview/llpanelpicks.cpp # indra/newview/llpanelpicks.h # indra/newview/llviewerfloaterreg.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 branch 'master' into DRTVWR-530-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-530-maint | Andrey Lihatskiy | |
2021-06-25 | Merge branch 'master' into DRTVWR-522-maint | Andrey Lihatskiy | |
# Conflicts: # indra/newview/app_settings/settings.xml | |||
2021-06-25 | Merge branch 'master' into DRTVWR-521-maint | Andrey Lihatskiy | |
2021-06-25 | Merge branch 'master' into DRTVWR-516-maint | Andrey Lihatskiy | |
# Conflicts: # indra/newview/app_settings/settings.xml # indra/newview/llvoicevivox.cpp |