Age | Commit message (Collapse) | Author | |
---|---|---|---|
2023-05-02 | Merge branch 'main' into DRTVWR-582-maint-U | Andrey Lihatskiy | |
2023-04-26 | Merge remote-tracking branch 'origin/DRTVWR-539' into DRTVWR-559-merge-539 | Brad Linden | |
2023-04-25 | SL-19575 LLFloaterEmojiPicker - code cleanup and layout fixup | Alexander Gavriliuk | |
2023-04-19 | SL-19623 Updated contributions | Andrey Kleshchev | |
2023-04-11 | SL-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-07 | Merge branch 'main' into marchcat/main-contrib-merge | Andrey 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-30 | Merge branch 'main' into DRTVWR-567 | Maxim 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-29 | Merge remote-tracking branch 'origin/main' into DRTVWR-559 | Brad Linden | |
2023-03-30 | Merge branch 'main' into DRTVWR-580-maint-T | Andrey Lihatskiy | |
2023-03-30 | Merge branch 'main' into DRTVWR-577-maint-S | Andrey Lihatskiy | |
# Conflicts: # indra/cmake/CMakeLists.txt # indra/newview/skins/default/xui/es/floater_tools.xml | |||
2023-03-22 | SL-19399: Thanks to Ai Austin for PBR material editing improvement idea | Cosmic Linden | |
2023-03-22 | SL-4126 Updated contributions.txt | Andrey Lihatskiy | |
2023-03-20 | Merge branch 'DRTVWR-568' into DRTVWR-573-maint-R | Andrey 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-03 | SL-19336 Unload avatar and group icons from memory when not visible to ↵ | Rye Mutt | |
reduce memory pressure on extremely large friends lists | |||
2023-03-02 | SL-19317 fix for avatar attachment accounting | Mnikolenko Productengine | |
2023-02-14 | SL-19140 Fix contribution doc | Andrey Kleshchev | |
2023-02-13 | SL-19207 Update contributions document | Andrey Kleshchev | |
2023-02-09 | Merge branch 'main' into DRTVWR-577-maint-S | Andrey 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-07 | SL-19159 Update contribution doc | Andrey Kleshchev | |
2023-02-03 | Merge branch 'main' into DRTVWR-567 | Maxim Nikolenko | |
# Conflicts: # indra/newview/llappearancemgr.cpp # indra/newview/llpanelmaininventory.cpp | |||
2023-02-03 | Merge branch 'main' into DRTVWR-539 | Mnikolenko 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-02 | Merge remote-tracking branch 'origin/main' into DRTVWR-559 | Brad Linden | |
2023-02-01 | SL-18988 Updated contributions.txt | Andrey Lihatskiy | |
2023-01-31 | SL-19110 Fix xxhash build link and properly register contribution | Andrey Kleshchev | |
2023-01-31 | SL-19110 Fix xxhash build link and properly register contribution | Andrey Kleshchev | |
2023-01-10 | SL-18937 Update contributions | Andrey Kleshchev | |
2023-01-04 | SL-18904 Remove unused translation files | Andrey Kleshchev | |
2023-01-04 | SL-18893 Update list of contributors | Andrey Kleshchev | |
2022-12-13 | SL-15175 Updates for TP states while the viewer is minimized | Andrey Kleshchev | |
2022-12-13 | Merge branch 'main' into DRTVWR-539 | Mnikolenko Productengine | |
# Conflicts: # doc/contributions.txt # indra/newview/llappviewer.cpp # indra/newview/skins/default/colors.xml | |||
2022-12-12 | Merge branch 'main' into DRTVWR-568 | Callum Prentice | |
2022-12-12 | Merge branch 'main' into DRTVWR-570-maint-Q | Andrey Lihatskiy | |
# Conflicts: # doc/contributions.txt # indra/newview/app_settings/shaders/class1/deferred/materialF.glsl # indra/newview/llfloater360capture.cpp | |||
2022-12-12 | SL-16874 Added tool tips to buttons displayed by llDialog() | Andrey Lihatskiy | |
2022-11-22 | Merge branch 'DRTVWR-568' into DRTVWR-539 | Mnikolenko Productengine | |
2022-11-22 | Merge branch 'master' into DRTVWR-539 | Mnikolenko Productengine | |
2022-11-21 | Merge branch 'master' into DRTVWR-570-maint-Q | Andrey Lihatskiy | |
2022-11-21 | Merge branch master into DRTVWR-565-maint-P | Andrey Kleshchev | |
2022-11-18 | Fix spelling error on license file name | Kyler Eastridge | |
2022-11-18 | Fix readme logo for dark theme sites | Kyler Eastridge | |
2022-11-14 | SL-18637 Reverted material shader changes | Andrey Lihatskiy | |
original fix by Beq Janus | |||
2022-11-09 | SL-18586 FIXED Crash when opening 360 snapshot | Mnikolenko Productengine | |
2022-11-09 | Merge remote-tracking branch ↵ | Andrey Lihatskiy | |
'BeqJanus/ll-viewer-pull-requests/Beq-alpha-mask-on-emissive-fix' into DRTVWR-570-maint-Q | |||
2022-11-09 | Merge remote-tracking branch 'ZiRee/viewer/master' into DRTVWR-570-maint-Q | Andrey Lihatskiy | |
2022-11-02 | Merge remote-tracking branch 'RyeMutt/viewer/mac-fixes' into DRTVWR-570-maint-Q | Andrey Lihatskiy | |
2022-11-01 | Merge remote-tracking branch 'RyeMutt/viewer/llsd-usage-fixes' into ↵ | Andrey Lihatskiy | |
DRTVWR-570-maint-Q | |||
2022-10-29 | Merge remote-tracking branch ↵ | Andrey Lihatskiy | |
'RyeMutt/viewer/datapacker-crashfixes/datapacker-crashfixes' into DRTVWR-570-maint-Q | |||
2022-10-27 | Merge branch 'master' into DRTVWR-539 | Mnikolenko Productengine | |
2022-10-26 | Merge branch 'master' into DRTVWR-570-maint-Q | Andrey Lihatskiy | |
2022-10-26 | Merge branch 'master' into DRTVWR-568 | Callum Linden | |
2022-10-24 | Merge master into DRTVWR-568 (and fix conflicts) | Callum Linden | |