summaryrefslogtreecommitdiff
path: root/doc
AgeCommit message (Collapse)Author
2023-03-02SL-19317 fix for avatar attachment accountingMnikolenko Productengine
2023-02-03Merge branch 'main' into DRTVWR-539Mnikolenko Productengine
# Conflicts: # doc/contributions.txt # indra/cmake/Copy3rdPartyLibs.cmake # indra/cmake/FindOpenJPEG.cmake # indra/cmake/OpenJPEG.cmake # indra/integration_tests/llui_libtest/CMakeLists.txt # indra/newview/CMakeLists.txt
2022-12-13Merge branch 'main' into DRTVWR-539Mnikolenko Productengine
# Conflicts: # doc/contributions.txt # indra/newview/llappviewer.cpp # indra/newview/skins/default/colors.xml
2022-12-12Merge branch 'main' into DRTVWR-570-maint-QAndrey Lihatskiy
# Conflicts: # doc/contributions.txt # indra/newview/app_settings/shaders/class1/deferred/materialF.glsl # indra/newview/llfloater360capture.cpp
2022-12-12SL-16874 Added tool tips to buttons displayed by llDialog()Andrey Lihatskiy
2022-11-22Merge branch 'DRTVWR-568' into DRTVWR-539Mnikolenko Productengine
2022-11-22Merge branch 'master' into DRTVWR-539Mnikolenko Productengine
2022-11-21Merge branch 'master' into DRTVWR-570-maint-QAndrey Lihatskiy
2022-11-21Merge branch master into DRTVWR-565-maint-PAndrey Kleshchev
2022-11-18Fix spelling error on license file nameKyler Eastridge
2022-11-18Fix readme logo for dark theme sitesKyler Eastridge
2022-11-14SL-18637 Reverted material shader changesAndrey Lihatskiy
original fix by Beq Janus
2022-11-09SL-18586 FIXED Crash when opening 360 snapshotMnikolenko Productengine
2022-11-09Merge remote-tracking branch ↵Andrey Lihatskiy
'BeqJanus/ll-viewer-pull-requests/Beq-alpha-mask-on-emissive-fix' into DRTVWR-570-maint-Q
2022-11-09Merge remote-tracking branch 'ZiRee/viewer/master' into DRTVWR-570-maint-QAndrey Lihatskiy
2022-11-02Merge remote-tracking branch 'RyeMutt/viewer/mac-fixes' into DRTVWR-570-maint-QAndrey Lihatskiy
2022-11-01Merge remote-tracking branch 'RyeMutt/viewer/llsd-usage-fixes' into ↵Andrey Lihatskiy
DRTVWR-570-maint-Q
2022-10-29Merge remote-tracking branch ↵Andrey Lihatskiy
'RyeMutt/viewer/datapacker-crashfixes/datapacker-crashfixes' into DRTVWR-570-maint-Q
2022-10-27Merge branch 'master' into DRTVWR-539Mnikolenko Productengine
2022-10-26Merge branch 'master' into DRTVWR-570-maint-QAndrey Lihatskiy
2022-10-26Merge branch 'master' into DRTVWR-568Callum Linden
2022-10-24Merge master into DRTVWR-568 (and fix conflicts)Callum Linden
2022-10-24SL-18432 Fix for alpha sortingAndrey Lihatskiy
2022-10-21Merge branch 'master' into DRTVWR-539Mnikolenko Productengine
# Conflicts: # indra/newview/llfloaterpreference.cpp # indra/newview/llviewercontrol.cpp
2022-10-20Merge branch 'master' into DRTVWR-570-maint-QAndrey Lihatskiy
# Conflicts: # indra/newview/llnetmap.cpp # indra/newview/llnetmap.h
2022-10-19SL-18412 Merge remote-tracking branch 'RyeMutt/viewer/menu-leaks' into ↵Andrey Lihatskiy
DRTVWR-570-maint-Q
2022-10-13SL-18348 FIXED Include next/previous face doesn't workMnikolenko Productengine
2022-10-01SL-14696 SL-13629 Re-add gradation fix after merging a contributionAndrey Kleshchev
2022-09-28SL-18249 Optimizations to mesh and material loadingAndrey Kleshchev
2022-09-28SL-18248 Move frame breakdown stats to 'Scene loading statistics' floaterMnikolenko Productengine
2022-09-17SL-17238 Large cmake contribution by NickyDAndrey Kleshchev
2022-08-31Merge branch 'master' into DRTVWR-548-maint-NAndrey Lihatskiy
2022-06-29Merge branch 'master' into DRTVWR-548-maint-NAndrey Lihatskiy
# Conflicts: # doc/contributions.txt # indra/newview/llviewercontrol.cpp
2022-06-29Merge branch 'master' (DRTVWR-543) into DRTVWR-483Andrey Kleshchev
# Conflicts: # indra/newview/llviewertexturelist.cpp
2022-06-22SL-17634 Replace deprecated carbon Gestalt callsMaxim Nikolenko
2022-06-20SL-17585 Don't bother users with dialogs if we are already quitingAndrey Kleshchev
2022-05-27Merge branch 'master' into DRTVWR-543-maintAndrey 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-26Merge branch 'master' into DRTVWR-483Andrey Lihatskiy
# Conflicts: # indra/newview/llviewertexturelist.cpp
2022-04-14SL-17218: Credit NickyD's contributions to this Jira.Nat Goodspeed
2022-03-05SL-14541 Pull in updated zlib-ngAndrey Kleshchev
Nicky Dasmijn's contribution for zlib-ng Linux builds
2022-03-01Merge branch 'master' (DRTVWR-557) into DRTVWR-546Andrey 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-28Merge branch 'master' into DRTVWR-483Andrey Lihatskiy
# Conflicts: # indra/newview/llviewermenu.cpp
2022-01-21Revert "SL-14717 Ability to trigger left clicks (and more) on animesh objects"Andrey Lihatskiy
This reverts commit 8215fff0c2a1c895ef916837847cf7526ae61ef9. # Conflicts: # indra/newview/lltoolpie.cpp
2022-01-10Merge branch 'DRTVWR-530-maint' into DRTVWR-553-maint-mix-JKAndrey Lihatskiy
# Conflicts: # indra/newview/app_settings/key_bindings.xml # indra/newview/llappviewer.cpp # indra/newview/llkeyconflict.cpp
2021-12-26Merge branch 'master' into DRTVWR-483Andrey Lihatskiy
2021-12-15DRTVWR-546 merge up to 6.5.2Dave Houlton
2021-12-15Merge branch 'master' into DRTVWR-530-maintAndrey Lihatskiy
2021-12-15Merge branch 'master' (DRTVWR-552) into DRTVWR-527-maintAndrey Kleshchev
# Conflicts: # indra/media_plugins/cef/media_plugin_cef.cpp - setOnLoadEndCallback # indra/newview/llviewerassetstorage.cpp - mAssetCoroCount
2021-12-03SL-16438 Machine id for Linux is always 0Andrey Kleshchev
2021-11-16DRTVWR-546 merge in master v6.5.1Dave Houlton
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-27 06:03:30 +0000