summaryrefslogtreecommitdiff
path: root/indra/newview/llviewermenu.cpp
AgeCommit message (Collapse)Author
2023-04-26Merge remote-tracking branch 'origin/DRTVWR-539' into DRTVWR-559-merge-539Brad Linden
2023-04-17SL-19549 Add option to show ban lines on collisionAndrey Kleshchev
2023-04-12SL-19569 Don't reset probes when crossing parcel borders (whoops) and tone ↵RunitaiLinden
down glare on legacy materials.
2023-04-11SL-19564 Rebalance exposure and sky. Hack legacy diffuse map saturation and ↵RunitaiLinden
brightness to allow ACES Hill all the time.
2023-04-07SL-19538 Clear probes on sky setting slam. Better probe update ↵Dave Parks
prioritization. Incidental decruft.
2023-03-10SL-18629 WIP Replacing UDP creation messages with callback based AIS #2Andrey Kleshchev
findCategory and move_item_to_marketplacelistings
2023-02-28SL-19271 Remove ‘New folder window’, ‘Open in new window’ and ↵Maxim Nikolenko
‘Open’ from Gear menu
2023-02-27DRTVWR-559 Fix for occlusion culling going off the rails when settings ↵Dave Parks
change -- remove LLPipeline::resetVertexBuffers and add a sanity check to how long we wait for a query to be "available".
2023-02-24SL-19234 add Inventory settings floaterMaxim Nikolenko
2023-02-23SL-19252 Remove "#ifdef _CORY_TESTING" codeMaxim Nikolenko
2023-02-17SL-19105 WIP Single-folder inventory viewMaxim Nikolenko
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-08Merge branch 'xcode-14.1' into DRTVWR-489-emojiKitty Barnett
2023-02-03SL-19148 Decruft some forward shaders and drawpools. Fix HUDs being in ↵Dave Parks
wrong color space.
2023-02-03SL-19109 Decouple object profiles from inventoryAndrey Kleshchev
Potentially this won't stay as sidepanels, but such rework is planned for SL-19134, for now just making it possible to open multiple instances of item profiles
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-01-24SL-19025 Fix for object's context menuAndrey Kleshchev
Inspect and copy doesn't work for face or child selection. Disable them in such cases.
2023-01-20Fix merge conflicts after auto mergeCallum Linden
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 remote-tracking branch 'origin/main' into DRTVWR-559Brad Linden
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-11-29SL-18727 Save material to Inventoryshould prioritize picked faceAndrey Kleshchev
2022-11-24SL-18701 llsd is not thread safe, parse it before usingAndrey Kleshchev
2022-11-18SL-18677 Disable materials UI when materials caps are not availableAndrey Kleshchev
2022-11-16SL-18154 Profile guided optimizations vs release viewer. Trim some unused ↵Dave Parks
abilities and remove some more fast timers.
2022-11-09Merge branch contribution/emoji into DRTVWR-489-emojiKitty Barnett
2022-11-01Merge remote-tracking branch 'RyeMutt/viewer/minor-fixes' into ↵Andrey Lihatskiy
DRTVWR-570-maint-Q
2022-10-31SL-18448 Do not show editor when saving material inworld, only a name promptAndrey Kleshchev
2022-10-30Fix menu checks for enabling object sit and touch to not traverse the entire ↵Rye Mutt
menu holder to update labels
2022-10-27DRTVWR-570 Mac build fix: unused variables cleanupAndrey Lihatskiy
2022-10-27SL-18008 Edit PBR in menu should not be enabled if selection has no pbr ↵Andrey Kleshchev
materials
2022-10-26SL-18446 Terse-update selection set from live material editor #1Andrey Kleshchev
2022-10-22SL-18105 When saving an object's material to inventory, save the version ↵Dave Parks
that as overrides applied.
2022-10-21SL-18105 Hook up live material editor to current selection set and ↵Dave Parks
implicitly open build floater when editing a PBR material.
2022-10-21Merge branch 'master' (DRTVWR-548) into DRTVWR-559Andrey Kleshchev
# Conflicts: # indra/llrender/llgl.cpp # indra/llrender/llrendertarget.cpp # indra/newview/VIEWER_VERSION.txt # indra/newview/app_settings/shaders/class1/deferred/materialF.glsl # indra/newview/llfloaterpreference.cpp # indra/newview/llviewercontrol.cpp # indra/newview/llviewermenu.cpp # indra/newview/llviewertexturelist.cpp # indra/newview/llvovolume.cpp
2022-10-21Merge branch 'master' into DRTVWR-539Mnikolenko Productengine
# Conflicts: # indra/newview/llfloaterpreference.cpp # indra/newview/llviewercontrol.cpp
2022-10-20Merge branch 'master' into DRTVWR-570-maint-QAndrey Lihatskiy
# Conflicts: # indra/newview/llnetmap.cpp # indra/newview/llnetmap.h
2022-10-20Merge branch 'master' into DRTVWR-565-maint-PAndrey Lihatskiy
2022-10-18SL-18008 Mac build fixAndrey Kleshchev
2022-10-18SL-18008 Updated Save and Edit PBR buttonsAndrey Kleshchev
2022-10-17SL-18008 Add Save and Edit buttons to right click menu for materialsAndrey Kleshchev
2022-10-14SL-18293 Fix for broken wireframe mode.Dave Parks
2022-10-13SL-18348 FIXED Include next/previous face doesn't workMnikolenko Productengine
2022-09-21Merge branch 'master' into DRTVWR-539Mnikolenko Productengine
2022-09-16Merge branch 'DRTVWR-559' of ssh://bitbucket.org/lindenlab/viewer into ↵Dave Parks
DRTVWR-559
2022-09-16SL-18128 Clear out much OpenGL cruft and switch to core profile on AMDDave Parks
2022-09-16Merge branch master (DRTVWR-571) into DRTVWR-559Andrey Kleshchev
# Conflicts: # indra/newview/llpanelface.cpp # indra/newview/llpanelface.h
2022-09-15Merge branch 'master' into DRTVWR-548-maint-NAndrey Lihatskiy
# Conflicts: # indra/newview/llmodelpreview.h
2022-09-15Merge branch 'master' into DRTVWR-565-maint-PAndrey Lihatskiy
generated by cgit v1.2.3 (git 2.25.1) at 2024-10-23 15:25:59 +0000