summaryrefslogtreecommitdiff
path: root/indra/newview/llviewermenu.cpp
AgeCommit message (Collapse)Author
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-14SL-20233 Add command to remove selected avatar attachment(s)Andrey Kleshchev
2023-10-16SL-20258 Fix for LSL spamming new probes into the scene deadlocking probe ↵RunitaiLinden
updater. Add probe update debug display.
2023-10-08Merge branch main into DRTVWR-489Alexander Gavriliuk
2023-10-03Merge branch 'main' into DRTVWR-588-maint-WAndrey Lihatskiy
# Conflicts: # indra/llui/lltooltip.h # indra/newview/llinventoryfunctions.cpp # indra/newview/llvovolume.cpp # indra/newview/skins/default/textures/textures.xml
2023-10-03Merge branch 'main' (DRTVWR-567) into DRTVWR-559Andrey 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-24Merge remote-tracking branch 'origin/main' into DRTVWR-489Andrey Kleshchev
# Conflicts: # indra/llcommon/llsdserialize.cpp # indra/llcommon/llsdserialize.h # indra/llmath/llvolume.cpp # indra/llrender/llgl.cpp # indra/llxml/llcontrol.cpp # indra/newview/llpanelnearbymedia.cpp # indra/newview/llsceneview.cpp # indra/newview/llselectmgr.cpp # indra/newview/llstartup.cpp # indra/newview/lltextureview.cpp # indra/newview/llvovolume.cpp # indra/newview/skins/default/xui/en/menu_viewer.xml
2023-08-23Merge branch main (DRTVWR-582) into DRTVWR-567Andrey 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-23Merge branch 'main' into DRTVWR-588-maint-WAndrey Lihatskiy
2023-08-23Merge remote-tracking branch 'origin/main' into DRTVWR-559Brad Linden
2023-08-17SL-20158 FIXED Ctrl+H shortcut acts erratically when Nearby Chat floater is ↵Mnikolenko Productengine
undocked
2023-07-28SL-20094 Add "Select Reflection Probes" checkboxRunitaiLinden
2023-07-27SL-18396 PBR and blinn phong should not be allowed to be edited togetherAndrey Kleshchev
2023-07-18DRTVWR-489: trivial merge conflict fixCallum Prentice
2023-07-17Merge branch 'main' (DRTVWR-580) into DRTVWR-567Andrey Kleshchev
# Conflicts: # indra/llui/llfolderviewitem.cpp # indra/newview/llinventorymodel.cpp # indra/newview/llinventorymodelbackgroundfetch.cpp
2023-07-17Merge branch 'main' into DRTVWR-582-maint-UAndrey Lihatskiy
# Conflicts: # doc/contributions.txt # indra/llcommon/llerrorthread.cpp
2023-06-23SL-19897 Fix for 100% transparent objects not showing up in highlight ↵RunitaiLinden
transparent until LoD switch.
2023-05-23SL-19753 PBR Some changes to the right-click menuAndrey Kleshchev
2023-05-17Add a binary cache for compiled shaders using glProgramBinary (#216)Rye Mutt
* Add a binary cache for compiled shaders using glProgramBinary * Add additional sanity checking to shader binary save and load, hook up cache clear and menu option * Fix default init of shader cache data struct and clear gl errors before glGetError calls --------- Co-authored-by: RunitaiLinden <davep@lindenlab.com>
2023-05-17SL-19655 Decruft legacy GLSL shaders and now unused build queues.RunitaiLinden
2023-05-17Merge branch 'main' into DRTVWR-567Andrey Lihatskiy
# Conflicts: # doc/contributions.txt
2023-05-17Some small tweaks after merge with Viewer releaseCallum Prentice
2023-05-17Merge remote-tracking branch 'origin/main' into DRTVWR-559Brad Linden
2023-05-17Merge branch 'main' into DRTVWR-582-maint-UAndrey Lihatskiy
# Conflicts: # indra/newview/llagentlistener.cpp # indra/newview/llcommanddispatcherlistener.cpp # indra/newview/llfilepicker_mac.mm # indra/newview/llworldmapview.cpp
2023-05-17Merge branch 'main' into DRTVWR-580-maint-TAndrey Lihatskiy
# Conflicts: # doc/contributions.txt # indra/llcharacter/llkeyframemotion.cpp # indra/newview/llfilepicker.cpp
2023-05-15SL-19676 - more IL control, added Reset Interest List Debug menu commandsimon
2023-05-13sl-19676 - 360 Intereset list mode. Changed mode to be a string forsimon
future expansion instead of a bool toggle
2023-05-11sl-19676 - more loading stats and 360 Interest List mode worksimon
2023-05-09Merge pull request #205 from secondlife/sl-19676-360mode-statssimon-linden
sl-19676 - Stats on updates and scene loading
2023-05-04First work on sl-19676 - Stats on updatessimon
2023-05-02MErge with main after Viewer releaseCallum Prentice
2023-05-02Merge branch 'main' into DRTVWR-567Andrey Lihatskiy
# Conflicts: # indra/newview/llappviewer.cpp
2023-05-02Merge branch 'main' into DRTVWR-577-maint-SAndrey Lihatskiy
2023-05-02Merge branch 'main' into DRTVWR-580-maint-TAndrey Lihatskiy
2023-05-02Merge branch 'main' into DRTVWR-582-maint-UAndrey Lihatskiy
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.
generated by cgit v1.2.3 (git 2.25.1) at 2025-10-31 12:07:23 +0000