Age | Commit message (Collapse) | Author | |
---|---|---|---|
2024-01-23 | Create test plan for optimizeAwayAlpha (#663) | RunitaiLinden | |
2023-12-14 | Merge remote-tracking branch 'origin/main' into DRTVWR-596 | Brad Linden | |
2023-12-13 | Credit Henri for HUD fix | Cosmic Linden | |
2023-11-29 | Merge branch 'DRTVWR-559' into marchcat/587-v-pbr-merge | Andrey Lihatskiy | |
# Conflicts: # indra/llcommon/CMakeLists.txt # indra/newview/llspatialpartition.cpp # indra/newview/llviewergenericmessage.cpp # indra/newview/llvoavatar.cpp | |||
2023-10-03 | Merge branch 'main' into DRTVWR-587-maint-V | Andrey Lihatskiy | |
# Conflicts: # indra/newview/llinventorymodel.cpp # indra/newview/llvovolume.cpp | |||
2023-10-03 | Merge branch 'main' (DRTVWR-567) into DRTVWR-559 | Andrey Kleshchev | |
# Conflicts: # indra/newview/CMakeLists.txt # indra/newview/VIEWER_VERSION.txt # indra/newview/llagent.cpp # indra/newview/llfloaternewfeaturenotification.cpp # indra/newview/llinventorybridge.cpp # indra/newview/llinventorymodel.cpp # indra/newview/lloutfitgallery.cpp # indra/newview/llpanelmaininventory.cpp # indra/newview/llpanelmaininventory.h # indra/newview/llsidepaneltaskinfo.cpp # indra/newview/llsidepaneltaskinfo.h # indra/newview/lltexturectrl.cpp # indra/newview/lltexturectrl.h # indra/newview/llviewerinventory.cpp # indra/newview/llviewerobject.cpp # indra/newview/llviewertexturelist.cpp # indra/newview/llviewertexturelist.h # indra/newview/skins/default/xui/en/floater_new_feature_notification.xml # indra/newview/skins/default/xui/en/menu_inventory.xml | |||
2023-08-29 | SL-20224 Update contributions | Andrey Kleshchev | |
Fix builds using OpenAL | |||
2023-08-23 | Merge branch main (DRTVWR-582) into DRTVWR-567 | Andrey Kleshchev | |
# Conflicts: # indra/newview/app_settings/settings.xml # indra/newview/llinventoryfunctions.cpp # indra/newview/llinventoryfunctions.h # indra/newview/llinventorymodel.cpp # indra/newview/llinventoryobserver.cpp # indra/newview/llinventoryobserver.h # indra/newview/skins/default/xui/ja/floater_inventory_item_properties.xml | |||
2023-08-23 | Merge branch 'main' into DRTVWR-587-maint-V | Andrey Lihatskiy | |
# Conflicts: # autobuild.xml | |||
2023-08-23 | Merge remote-tracking branch 'origin/main' into DRTVWR-559 | Brad Linden | |
2023-07-24 | SL-20054 Update contributions.txt | Andrey Lihatskiy | |
2023-07-17 | Merge pull request #285 from secondlife/marchcat/SL-19669 | marchcat-pe | |
INTL-490 Japanese Translation Update | |||
2023-07-17 | Merge remote-tracking branch 'origin/main' into DRTVWR-559 | Brad Linden | |
2023-07-17 | Merge branch 'main' (DRTVWR-580) into DRTVWR-567 | Andrey Kleshchev | |
# Conflicts: # indra/llui/llfolderviewitem.cpp # indra/newview/llinventorymodel.cpp # indra/newview/llinventorymodelbackgroundfetch.cpp | |||
2023-07-17 | Merge branch 'main' into DRTVWR-582-maint-U | Andrey Lihatskiy | |
# Conflicts: # doc/contributions.txt # indra/llcommon/llerrorthread.cpp | |||
2023-05-28 | INTL-490 Japanese Translation Update | Andrey Lihatskiy | |
provided by Logue Takacs | |||
2023-05-17 | Merge branch 'main' into DRTVWR-567 | Andrey Lihatskiy | |
# Conflicts: # doc/contributions.txt | |||
2023-05-17 | Merge remote-tracking branch 'origin/main' into DRTVWR-559 | Brad Linden | |
2023-05-17 | Merge branch 'main' into DRTVWR-582-maint-U | Andrey Lihatskiy | |
# Conflicts: # indra/newview/llagentlistener.cpp # indra/newview/llcommanddispatcherlistener.cpp # indra/newview/llfilepicker_mac.mm # indra/newview/llworldmapview.cpp | |||
2023-05-17 | Merge branch 'main' into DRTVWR-580-maint-T | Andrey Lihatskiy | |
# Conflicts: # doc/contributions.txt # indra/llcharacter/llkeyframemotion.cpp # indra/newview/llfilepicker.cpp | |||
2023-05-09 | SL-19660 Updated contributions doc | Andrey Kleshchev | |
2023-05-08 | SL-19690 Updated contribution doc | Andrey Kleshchev | |
2023-05-03 | SL-19681 Updated list of contributors | Andrey Kleshchev | |
2023-05-02 | Merge branch 'main' into DRTVWR-567 | Andrey Lihatskiy | |
# Conflicts: # indra/newview/llappviewer.cpp | |||
2023-05-02 | Merge branch 'main' into DRTVWR-577-maint-S | Andrey Lihatskiy | |
2023-05-02 | Merge branch 'main' into DRTVWR-580-maint-T | Andrey Lihatskiy | |
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-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 | |