summaryrefslogtreecommitdiff
path: root/doc
AgeCommit message (Collapse)Author
2023-04-26Merge remote-tracking branch 'origin/DRTVWR-539' into DRTVWR-559-merge-539Brad Linden
2023-04-25SL-19575 LLFloaterEmojiPicker - code cleanup and layout fixupAlexander Gavriliuk
2023-04-19SL-19623 Updated contributionsAndrey Kleshchev
2023-04-11SL-19139 Credits for Kitty - update the contributors.txt file with a mention ↵Callum Prentice
of Kitty's large contribution. (No externally facing JIRA that I can find)
2023-04-07Merge branch 'main' into marchcat/main-contrib-mergeAndrey Lihatskiy
# Conflicts: # indra/cmake/CMakeLists.txt # indra/llcommon/llsdserialize.cpp # indra/llcommon/llsdserialize.h # indra/llcommon/tests/llleap_test.cpp # indra/newview/llfilepicker.h # indra/newview/llfilepicker_mac.h # indra/newview/llfilepicker_mac.mm # indra/newview/skins/default/xui/en/strings.xml
2023-03-30Merge branch 'main' into DRTVWR-567Maxim Nikolenko
# Conflicts: # indra/newview/llinventoryfunctions.cpp # indra/newview/llpanelmaininventory.h # indra/newview/skins/default/xui/en/floater_inventory_item_properties.xml # indra/newview/skins/default/xui/en/sidepanel_item_info.xml
2023-03-29Merge remote-tracking branch 'origin/main' into DRTVWR-559Brad Linden
2023-03-30Merge branch 'main' into DRTVWR-580-maint-TAndrey Lihatskiy
2023-03-30Merge branch 'main' into DRTVWR-577-maint-SAndrey Lihatskiy
# Conflicts: # indra/cmake/CMakeLists.txt # indra/newview/skins/default/xui/es/floater_tools.xml
2023-03-22SL-19399: Thanks to Ai Austin for PBR material editing improvement ideaCosmic Linden
2023-03-22SL-4126 Updated contributions.txtAndrey Lihatskiy
2023-03-20Merge branch 'DRTVWR-568' into DRTVWR-573-maint-RAndrey Lihatskiy
# Conflicts: # indra/cmake/Copy3rdPartyLibs.cmake # indra/cmake/FindOpenJPEG.cmake # indra/cmake/OpenJPEG.cmake # indra/integration_tests/llui_libtest/CMakeLists.txt # indra/newview/CMakeLists.txt
2023-03-03SL-19336 Unload avatar and group icons from memory when not visible to ↵Rye Mutt
reduce memory pressure on extremely large friends lists
2023-03-02SL-19317 fix for avatar attachment accountingMnikolenko Productengine
2023-02-14SL-19140 Fix contribution docAndrey Kleshchev
2023-02-13SL-19207 Update contributions documentAndrey Kleshchev
2023-02-09Merge branch 'main' into DRTVWR-577-maint-SAndrey Kleshchev
# Conflicts: # indra/llcommon/llsdserialize.cpp # indra/llcommon/llsdserialize.h # indra/newview/llfilepicker.h # indra/newview/llfilepicker_mac.h # indra/newview/llfilepicker_mac.mm
2023-02-07SL-19159 Update contribution docAndrey Kleshchev
2023-02-03Merge branch 'main' into DRTVWR-567Maxim Nikolenko
# Conflicts: # indra/newview/llappearancemgr.cpp # indra/newview/llpanelmaininventory.cpp
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
2023-02-02Merge remote-tracking branch 'origin/main' into DRTVWR-559Brad Linden
2023-02-01SL-18988 Updated contributions.txtAndrey Lihatskiy
2023-01-31SL-19110 Fix xxhash build link and properly register contributionAndrey Kleshchev
2023-01-31SL-19110 Fix xxhash build link and properly register contributionAndrey Kleshchev
2023-01-10SL-18937 Update contributionsAndrey Kleshchev
2023-01-04SL-18904 Remove unused translation filesAndrey Kleshchev
2023-01-04SL-18893 Update list of contributorsAndrey Kleshchev
2022-12-13SL-15175 Updates for TP states while the viewer is minimizedAndrey Kleshchev
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-568Callum Prentice
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
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-24 22:25:01 +0000