summaryrefslogtreecommitdiff
path: root/indra/newview/skins
AgeCommit message (Collapse)Author
2024-03-01secondlife/viewer#712: Use checkbox to make it more obvious that only one ↵Cosmic Linden
set of terrain assets is preserved. Clean up enums.
2024-03-02Revert "Update emoji_categories in Polish translation to slightly more ↵Andrey Kleshchev
correct erms..." This reverts commit 60debe828b87c33fdbd33e3a5fcef423e544fe55.
2024-03-01Update emoji_categories in Polish translation to slightly more correct erms...Pantera Północy
2024-03-01Merge remote-tracking branch 'origin/release/gltf-maint2' into ↵Brad Linden
release/materials_featurette
2024-03-01Merge remote-tracking branch 'origin/main' into release/gltf-maint2Brad Linden
2024-03-01Merge branch 'main' into marchcat/yz-mergeAndrey Lihatskiy
# Conflicts: # indra/newview/llinventorygallery.cpp
2024-03-01Merge branch 'main' into DRTVWR-588-maint-WAndrey Lihatskiy
2024-02-21Add the option to use clean lua_State in "Lua debug" floaterMnikolenko Productengine
2024-02-09#68 The 'Recently used emoji' can not be selected by the 'Tab' keyAlexander Gavriliuk
2024-02-08Make the UI conditional.Jonathan "Geenz" Goodman
2024-02-08SL-20363 Add Advanced option 'Debug Unicode'Alexander Gavriliuk
2024-02-07Issue #56 Redirect Help>Report Bug to Canny instead of JiraAndrey Kleshchev
2024-02-07Merge branch 'materials_featurette/mirrors' of ↵RunitaiLinden
https://github.com/secondlife/viewer into materials_featurette/mirrors
2024-02-06#679 Add mirror update params to the volume floater.Jonathan "Geenz" Goodman
#740 Add support for FLAG_MIRROR in the viewer for mirror probes.
2024-02-05Merge branch 'DRTVWR-599-maint-Z' into release/maint-yzAndrey Lihatskiy
# Conflicts: # indra/newview/llchiclet.h
2024-01-31secondlife/viewer-issues#43: Proof-of-concept PBR terrain normal gen feature ↵Cosmic Linden
flag. Final implementation would likely be very different.
2024-01-24Merge remote-tracking branch 'origin/release/materials_featurette' into ↵Jonathan "Geenz" Goodman
DRTVWR-583
2024-01-24SL-20416 Use image from file for emoji_recent_panel_toggle_btnAlexander Gavriliuk
2024-01-24Fix profile's pick hiding wrong panelAndrey Kleshchev
And cleanup after a contribution
2024-01-23Put PBR terrain behind feature flagCosmic Linden
2024-01-24SL-20416 Avoid of taking focus by EmojiPickerAlexander Gavriliuk
2024-01-22NSException testAndrey Kleshchev
2024-01-19Merge branch 'release/materials_featurette' into DRTVWR-592RunitaiLinden
2024-01-18Fix broken fontsAndrey Kleshchev
partial revert of 06c2c87bfaf364cb358b8a4b194e6369531a63c6
2024-01-17SL-20795 Part of previously typed emojis disappear in the 'Save settings as ↵Alexander Gavriliuk
a preset...' option of the 'Preferences' floater
2024-01-08DRTVWR-589: Merge branch 'main' into DRTVWR-589.Nat Goodspeed
2024-01-08Merge branch 'main' into DRTVWR-489Andrey Lihatskiy
# Conflicts: # indra/newview/llmaterialeditor.cpp
2024-01-08Merge branch 'main' into DRTVWR-599-maint-ZAndrey Lihatskiy
2024-01-08Merge branch 'main' into DRTVWR-594-maint-YAndrey Lihatskiy
2024-01-08Merge branch 'main' into DRTVWR-588-maint-WAndrey Lihatskiy
2024-01-08Merge main (DRTVWR-596 GLTF Materials Maint) into DRTVWR-591-maint-XAndrey Kleshchev
# Conflicts: # indra/newview/VIEWER_VERSION.txt
2024-01-04DRTVWR-589: Merge branch 'main' into DRTVWR-589Nat Goodspeed
2024-01-04SL-17896 Don't crash silently if files are missing or out of memoryAndrey Kleshchev
Under debug LL_ERRS will show a message as well, but release won't show anything and will quit silently so show a notification when applicable.
2023-12-18Merge branch 'main' into DRTVWR-591-maint-XAndrey Lihatskiy
# Conflicts: # doc/contributions.txt # indra/newview/llpanelprofile.cpp # indra/newview/llspatialpartition.cpp
2023-12-18Merge branch 'main' into DRTVWR-594-maint-YAndrey Lihatskiy
2023-12-18Merge branch 'main' into DRTVWR-599-maint-ZAndrey Lihatskiy
2023-12-15SL-20702 Remove ALM info in AboutMnikolenko Productengine
2023-12-15Merge branch 'main' into DRTVWR-489Andrey Lihatskiy
# Conflicts: # indra/newview/fonts/DejaVu-license.txt # indra/newview/fonts/DejaVuSans-Bold.ttf # indra/newview/fonts/DejaVuSans-BoldOblique.ttf # indra/newview/fonts/DejaVuSans-Oblique.ttf # indra/newview/fonts/DejaVuSans.ttf # indra/newview/fonts/DejaVuSansMono.ttf
2023-12-14Merge branch 'DRTVWR-596' into DRTVWR-601Brad Linden
2023-12-14Merge remote-tracking branch 'origin/main' into DRTVWR-596Brad Linden
2023-12-14SL-20717 Add PBR to Advanced > Rendering TypesMaxim Nikolenko
2023-12-14Merge branch 'DRTVWR-587-maint-V' into DRTVWR-588-maint-WAndrey Lihatskiy
# Conflicts: # indra/newview/llspatialpartition.cpp
2023-12-06SL-20693 FIXED Classifieds publish price field misinterprets invalid valuesMnikolenko Productengine
2023-12-05Merge branch 'main' into DRTVWR-489Alexander Gavriliuk
2023-12-05SL-20681 fix spelling on exit promptMnikolenko Productengine
2023-12-04SL-20569 Fix notification's description in preferencesAndrey Kleshchev
2023-11-30Merge branch 'DRTVWR-594-maint-Y' into marchcat/594-y-pbr-mergeAndrey Lihatskiy
# Conflicts: # indra/newview/llinventorygallery.cpp # indra/newview/skins/default/xui/en/notifications.xml
2023-11-30Merge branch 'DRTVWR-591-maint-X' into marchcat/591-x-pbr-mergeAndrey Lihatskiy
# Conflicts: # indra/llrender/llgl.cpp # indra/llrender/llvertexbuffer.cpp # indra/llui/llflatlistview.cpp # indra/newview/app_settings/settings.xml # indra/newview/lldrawpoolground.cpp # indra/newview/llinventorybridge.cpp # indra/newview/llinventorygallery.cpp # indra/newview/llspatialpartition.cpp # indra/newview/llviewercontrol.cpp # indra/newview/llviewertexture.cpp # indra/newview/llvosky.cpp # indra/newview/skins/default/xui/en/menu_inventory.xml
2023-11-30Merge branch 'DRTVWR-588-maint-W' into marchcat/588-w-pbr-mergeAndrey 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-11-29Merge branch 'DRTVWR-559' into marchcat/587-v-pbr-mergeAndrey Lihatskiy
# Conflicts: # indra/llcommon/CMakeLists.txt # indra/newview/llspatialpartition.cpp # indra/newview/llviewergenericmessage.cpp # indra/newview/llvoavatar.cpp
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-26 00:06:40 +0000