Age | Commit message (Collapse) | Author | |
---|---|---|---|
2024-03-01 | Merge branch 'main' into DRTVWR-588-maint-W | Andrey Lihatskiy | |
2024-01-24 | SL-20416 Use image from file for emoji_recent_panel_toggle_btn | Alexander Gavriliuk | |
2023-12-05 | Merge branch 'main' into DRTVWR-489 | Alexander Gavriliuk | |
2023-11-30 | Merge branch 'DRTVWR-588-maint-W' into marchcat/588-w-pbr-merge | Andrey Lihatskiy | |
# Conflicts: # indra/llrender/llgl.cpp # indra/llrender/llvertexbuffer.cpp # indra/llui/llflatlistview.cpp # indra/newview/lldrawpoolground.cpp # indra/newview/llspatialpartition.cpp # indra/newview/lltexturefetch.cpp # indra/newview/llviewergenericmessage.cpp # indra/newview/llviewertexture.cpp # indra/newview/llvosky.cpp # indra/newview/skins/default/xui/en/floater_preferences_graphics_advanced.xml # indra/newview/skins/default/xui/en/floater_stats.xml # indra/newview/skins/default/xui/en/floater_texture_fetch_debugger.xml # indra/newview/skins/default/xui/en/notifications.xml # indra/newview/skins/default/xui/en/panel_performance_preferences.xml | |||
2023-10-08 | Merge branch main into DRTVWR-489 | Alexander Gavriliuk | |
2023-10-03 | Merge branch 'main' into DRTVWR-588-maint-W | Andrey Lihatskiy | |
# Conflicts: # indra/llui/lltooltip.h # indra/newview/llinventoryfunctions.cpp # indra/newview/llvovolume.cpp # indra/newview/skins/default/textures/textures.xml | |||
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-04 | SL-18049 Part 3; Better indication when voice is muted | Andrey Kleshchev | |
2023-08-01 | SL-19982 Adjustable font size in LSL editor | Mnikolenko Productengine | |
2023-07-28 | SL-20088 EmojiPicker - replace the image on the activation button with an emoji | Alexander Gavriliuk | |
2023-07-18 | DRTVWR-489: trivial merge conflict fix | Callum Prentice | |
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-05-02 | MErge with main after Viewer release | Callum Prentice | |
2023-05-02 | Merge branch 'main' into DRTVWR-567 | Andrey Lihatskiy | |
# Conflicts: # indra/newview/llappviewer.cpp | |||
2023-05-02 | Merge branch 'main' into DRTVWR-580-maint-T | Andrey Lihatskiy | |
2023-04-26 | Merge remote-tracking branch 'origin/DRTVWR-539' into DRTVWR-559-merge-539 | Brad Linden | |
2023-04-22 | SL-19636 Profile badges | Andrey Kleshchev | |
2023-04-14 | SL-19575 Create emoji gallery access icon | Alexander Gavriliuk | |
2023-02-24 | SL-19108 Fallback thumbnail | Andrey Kleshchev | |
2023-02-21 | SL-19105 Updated icons, menus and Received items panel visibility in ↵ | Maxim Nikolenko | |
single-folder mode | |||
2023-02-19 | SL-19108 WIP Managing inventory thumbnail #4 | Andrey Kleshchev | |
Added icons | |||
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 | |
2022-12-01 | SL-18243 Add wear and unwear buttons on line items in Outfits floater | Maxim Nikolenko | |
2022-09-21 | Merge branch 'master' into DRTVWR-539 | Mnikolenko Productengine | |
2022-09-16 | Merge branch master (DRTVWR-571) into DRTVWR-559 | Andrey Kleshchev | |
# Conflicts: # indra/newview/llpanelface.cpp # indra/newview/llpanelface.h | |||
2022-08-31 | SL-17703: Fix merge | Ptolemy | |
2022-08-30 | SL-17703: PBR: Fix albedo being in wrong color space, add support for debug ↵ | Ptolemy | |
default_irradiance.png | |||
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-31 | Merge branch 'master' into DRTVWR-544-maint | Andrey Lihatskiy | |
# Conflicts: # indra/newview/llpanelpicks.cpp # indra/newview/llpanelprofile.cpp | |||
2022-08-04 | Merge remote-tracking branch 'origin/master' into DRTVWR-559 | Brad Kittenbrink | |
2022-08-04 | Merge branch 'master' into DRTVWR-539 | Mnikolenko Productengine | |
2022-08-04 | Merge branch 'master' into DRTVWR-544-maint | Andrey Lihatskiy | |
# Conflicts: # indra/newview/llpanelface.cpp # indra/newview/llpanelface.h # indra/newview/llpanelobject.cpp | |||
2022-08-04 | Merge branch master (DRTVWR-561) into DRTVWR-483 | Andrey Kleshchev | |
2022-07-07 | SL-17666 Allow Map sidebar UI to be hidden | 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' into DRTVWR-539 | Mnikolenko Productengine | |
2022-06-29 | Merge branch 'master' into DRTVWR-561-maint-O | Andrey Lihatskiy | |
2022-06-29 | Merge branch 'master' into DRTVWR-544-maint | Andrey Lihatskiy | |
2022-06-29 | Merge branch 'master' (DRTVWR-543) into DRTVWR-483 | Andrey Kleshchev | |
# Conflicts: # indra/newview/llviewertexturelist.cpp | |||
2022-06-24 | SL-17649 Icon for Material type in Inventory | Mnikolenko Productengine | |
2022-05-27 | SL-15312 Online status | Andrey Kleshchev | |
2022-05-24 | SL-15312 Added new group visibility icons | Andrey Kleshchev | |
2022-05-18 | SL-15312 Added permission indicators | Andrey Kleshchev | |
2022-05-12 | SL-15312 New group visibility toggle. | Andrey Kleshchev | |
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-25 | Merge master into DRTVWR-486 | Andrey Kleshchev | |
2021-12-20 | Merge branch 'master' into DRTVWR-544-maint | Mnikolenko Productengine | |