Beq
|
062afc46fb
|
Mirrors should never be run at ultra except by explicit choice.
|
2025-04-23 18:06:01 +01:00 |
|
Ansariel
|
3f1373de4c
|
Merge branch 'release/2025.03' of https://github.com/secondlife/viewer
# Conflicts:
# indra/llkdu/llimagej2ckdu.cpp
# indra/llwindow/llwindowwin32.cpp
# indra/newview/lleventpoll.cpp
# indra/newview/llvoavatar.h
# indra/newview/llvoavatarself.h
|
2025-04-10 18:28:30 +02:00 |
|
Ansariel
|
99e1699479
|
Merge branch 'release/2025.03' of https://github.com/secondlife/viewer
# Conflicts:
# indra/llappearance/llwearable.cpp
# indra/newview/llappviewer.cpp
# indra/newview/llappviewerwin32.cpp
# indra/newview/llviewerassetstorage.cpp
# indra/newview/llviewertexturelist.cpp
# indra/newview/llviewerwindow.cpp
|
2025-03-27 19:36:45 +01:00 |
|
Ansariel
|
62e5fffd8e
|
Merge branch 'release/2025.03' of https://github.com/secondlife/viewer
# Conflicts:
# indra/newview/lldrawpooltree.cpp
# indra/newview/lllocalbitmaps.cpp
# indra/newview/lltextureview.cpp
# indra/newview/llviewertexture.cpp
# indra/newview/skins/default/colors.xml
|
2025-03-23 12:29:33 +01:00 |
|
Ansariel
|
750099db68
|
Merge branch 'release/2025.03' of https://github.com/secondlife/viewer
# Conflicts:
# indra/llmessage/llproxy.cpp
# indra/llui/llfolderviewitem.cpp
# indra/newview/CMakeLists.txt
# indra/newview/llappviewer.cpp
# indra/newview/llfilepicker.cpp
# indra/newview/llfloaterpreference.cpp
# indra/newview/lloutfitslist.cpp
# indra/newview/llpanelmaininventory.cpp
# indra/newview/llviewerprecompiledheaders.h
# indra/newview/llviewerwindow.cpp
# indra/newview/skins/default/xui/en/floater_world_map.xml
# indra/newview/skins/default/xui/en/menu_viewer.xml
# indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml
# indra/newview/viewer_manifest.py
|
2025-03-12 19:31:51 +01:00 |
|
Ansariel
|
83d74614cf
|
Merge branch 'release/2024.12-ForeverFPS' of https://github.com/secondlife/viewer
# Conflicts:
# indra/newview/llviewercontrol.cpp
# indra/newview/llviewertexture.cpp
# indra/newview/skins/default/xui/en/menu_viewer.xml
|
2025-01-22 00:42:22 +01:00 |
|
Ansariel
|
e930b9e1f3
|
Transplant changes
|
2024-12-05 23:32:48 +01:00 |
|
Ansariel
|
7c3b74a0df
|
Merge branch 'release/2024.09-ExtraFPS' of https://github.com/secondlife/viewer
# Conflicts:
# indra/newview/llviewertexture.cpp
# indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml
|
2024-12-04 16:11:44 +01:00 |
|
Ansariel
|
2e4c9f73b4
|
Merge branch 'release/2024.09-ExtraFPS' of https://github.com/secondlife/viewer
# Conflicts:
# indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml
|
2024-11-28 00:19:30 +01:00 |
|
Ansariel
|
68d82c9793
|
Merge branch 'release/2024.09-ExtraFPS' of https://github.com/secondlife/viewer
# Conflicts:
# indra/llrender/llvertexbuffer.cpp
# indra/newview/app_settings/settings.xml
# indra/newview/lltexturefetch.cpp
# indra/newview/viewer_manifest.py
|
2024-11-27 19:23:33 +01:00 |
|
Ansariel
|
1531b28979
|
Merge branch 'release/2024.09-ExtraFPS' of https://github.com/secondlife/viewer
# Conflicts:
# indra/newview/app_settings/settings.xml
# indra/newview/pipeline.cpp
|
2024-11-13 11:31:28 +01:00 |
|
Ansariel
|
ec8ead914d
|
Merge branch 'release/2024.09-ExtraFPS' of https://github.com/secondlife/viewer
# Conflicts:
# indra/llxml/llxmlnode.cpp
# indra/newview/featuretable_linux.txt
# indra/newview/skins/default/xui/en/notifications.xml
|
2024-10-31 19:42:30 +01:00 |
|
Rye
|
c9c6624400
|
Restore default exposure to 1 and add exposure and tonemapping featuretable entries (#2913) (#2916)
|
2024-10-24 16:44:45 -07:00 |
|
Ansariel
|
b1a253e26c
|
Merge branch 'release/2024.09-ExtraFPS' of https://github.com/secondlife/viewer
# Conflicts:
# indra/newview/skins/default/xui/en/menu_viewer.xml
|
2024-10-16 19:14:13 +02:00 |
|
Ansariel
|
95707d7c13
|
Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm-deltafps
# Conflicts:
# indra/newview/llviewertexturelist.cpp
|
2024-09-05 01:05:15 +02:00 |
|
Ansariel
|
b8a0d89dfc
|
Merge branch 'release/2024.08-DeltaFPS' of https://github.com/secondlife/viewer
# Conflicts:
# indra/llrender/llgl.h
# indra/newview/llviewermenu.cpp
# indra/newview/llviewertexture.cpp
# indra/newview/skins/default/xui/en/notifications.xml
|
2024-09-05 01:00:39 +02:00 |
|
Ansariel
|
bea9a8e612
|
Merge branch 'develop' of https://github.com/secondlife/viewer
# Conflicts:
# indra/newview/llviewertexturelist.cpp
# indra/newview/pipeline.cpp
# indra/newview/skins/default/xui/en/notifications.xml
|
2024-09-04 00:33:40 +02:00 |
|
Ansariel
|
9573cc8e00
|
Merge branch 'develop' of https://github.com/secondlife/viewer
# Conflicts:
# indra/newview/pipeline.cpp
# indra/newview/skins/default/xui/de/notifications.xml
# indra/newview/skins/default/xui/es/notifications.xml
# indra/newview/skins/default/xui/fr/notifications.xml
# indra/newview/skins/default/xui/it/notifications.xml
# indra/newview/skins/default/xui/ja/notifications.xml
# indra/newview/skins/default/xui/pt/notifications.xml
# indra/newview/skins/default/xui/ru/notifications.xml
|
2024-08-27 19:39:23 +02:00 |
|
Brad Linden
|
33c7a879c1
|
Bump featuretable versions to fix secondlife/viewer#2345 (#2386)
also fixed mac High entry for RenderMirrors that got missed
|
2024-08-21 12:02:21 -07:00 |
|
Ansariel
|
16db785e2f
|
Merge branch 'master' of https://bitbucket.org/Ansariel/phoenix-firestorm-atlasaurus
# Conflicts:
# indra/newview/featuretable.txt
# indra/newview/llpanelpeople.cpp
|
2024-08-21 01:54:01 +02:00 |
|
Ansariel
|
59bf1d192b
|
Merge branch 'release/2024.06-atlasaurus' of https://github.com/secondlife/viewer
# Conflicts:
# indra/newview/featuretable_linux.txt
|
2024-08-21 01:02:53 +02:00 |
|
Jonathan "Geenz" Goodman
|
56e1687680
|
#2345 Fix for mirrors not being disabled from previous viewer versions.
|
2024-08-20 14:05:40 -07:00 |
|
Ansariel
|
01f9dbc4e3
|
Merge branch 'develop' of https://github.com/secondlife/viewer
# Conflicts:
# indra/llcommon/llallocator_heap_profile.cpp
# indra/llui/lllayoutstack.cpp
# indra/newview/app_settings/settings.xml
# indra/newview/llappviewer.cpp
# indra/newview/llappviewer.h
# indra/newview/llfloaterpreference.cpp
# indra/newview/llfloaterpreferencesgraphicsadvanced.cpp
# indra/newview/llpanelmaininventory.cpp
# indra/newview/llpanelmaininventory.h
# indra/newview/lltextureview.cpp
# indra/newview/pipeline.cpp
# indra/newview/skins/default/xui/en/panel_preferences_colors.xml
|
2024-08-20 11:21:57 +02:00 |
|
Ansariel
|
e9b6550c48
|
Merge branch 'develop' of https://github.com/secondlife/viewer
# Conflicts:
# indra/llfilesystem/llfilesystem.cpp
# indra/newview/llappviewer.cpp
# indra/newview/lltextureview.cpp
# indra/newview/llviewertexture.h
# indra/newview/llviewertexturelist.cpp
|
2024-07-06 11:06:55 +02:00 |
|
Ansariel
|
3b902c9f36
|
Merge branch 'release/materials_featurette' of https://github.com/secondlife/viewer
# Conflicts:
# indra/fix-incredibuild.py
# indra/newview/CMakeLists.txt
# indra/newview/llagentbenefits.cpp
# indra/newview/llgltfmateriallist.cpp
# indra/newview/llspatialpartition.cpp
# indra/newview/llviewermenu.cpp
# indra/newview/llviewerregion.cpp
# indra/newview/llvocache.cpp
# indra/newview/llvocache.h
# indra/newview/llvovolume.cpp
# indra/newview/pipeline.cpp
# indra/newview/skins/default/xui/en/notifications.xml
# indra/newview/viewer_manifest.py
|
2024-04-17 10:57:12 +02:00 |
|
Ansariel
|
9f2be1de74
|
Merge branch 'release/materials_featurette' of https://github.com/secondlife/viewer
# Conflicts:
# indra/newview/app_settings/settings.xml
# indra/newview/lltexturectrl.cpp
# indra/newview/llviewermenu.cpp
# indra/newview/llviewerregion.cpp
# indra/newview/skins/default/xui/en/floater_tools.xml
|
2024-02-12 12:54:03 +01:00 |
|
Ansariel
|
9e8d3152dc
|
Sync feature table for Linux
|
2024-01-23 16:16:15 +01:00 |
|
Ansariel
|
becc1af2ec
|
Merge branch 'DRTVWR-559' of https://github.com/secondlife/viewer
# Conflicts:
# indra/newview/app_settings/settings.xml
# indra/newview/featuretable.txt
# indra/newview/featuretable_mac.txt
# indra/newview/lltexturectrl.cpp
# indra/newview/lltexturefetch.cpp
# indra/newview/llviewercontrol.cpp
# indra/newview/llvovolume.cpp
|
2023-10-11 12:58:24 +02:00 |
|
Ansariel
|
1d8360e8bb
|
Merge branch 'DRTVWR-559' of https://github.com/secondlife/viewer
# Conflicts:
# indra/newview/app_settings/settings.xml
# indra/newview/app_settings/shaders/class1/objects/previewV.glsl
# indra/newview/featuretable.txt
# indra/newview/featuretable_mac.txt
# indra/newview/llmodelpreview.cpp
# indra/newview/llviewerobject.cpp
# indra/newview/llviewershadermgr.cpp
|
2023-07-04 14:18:58 +02:00 |
|
Ansariel
|
a466a2b136
|
Merge branch 'DRTVWR-559' of https://github.com/secondlife/viewer
# Conflicts:
# indra/newview/app_settings/settings.xml
# indra/newview/llviewermedia.cpp
# indra/newview/llviewertexture.h
# indra/newview/skins/default/xui/en/floater_adjust_environment.xml
# indra/newview/skins/default/xui/en/panel_settings_sky_atmos.xml
|
2023-06-02 11:50:25 +02:00 |
|
Ansariel
|
4e416c48c2
|
Merge branch 'DRTVWR-559' of https://github.com/secondlife/viewer
# Conflicts:
# indra/newview/app_settings/settings.xml
# indra/newview/llmodelpreview.cpp
# indra/newview/skins/default/xui/en/menu_object.xml
# indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml
# indra/newview/skins/default/xui/en/panel_tools_texture.xml
|
2023-05-26 10:50:50 +02:00 |
|
Ansariel
|
aac968e43a
|
Merge branch 'DRTVWR-559' of https://github.com/secondlife/viewer
# Conflicts:
# indra/llcommon/llqueuedthread.cpp
# indra/llcommon/lluuid.cpp
# indra/llimage/llimageworker.h
# indra/newview/app_settings/settings.xml
# indra/newview/llappviewerwin32.cpp
# indra/newview/llfilepicker.cpp
# indra/newview/llviewercontrol.cpp
# indra/newview/llviewerobject.h
# indra/newview/llvovolume.cpp
# indra/newview/pipeline.cpp
|
2023-05-17 23:23:28 +02:00 |
|
Ansariel
|
11e9d2cdb6
|
Merge branch 'DRTVWR-559' of https://github.com/secondlife/viewer
# Conflicts:
# indra/newview/app_settings/settings.xml
# indra/newview/featuretable.txt
# indra/newview/featuretable_mac.txt
# indra/newview/llappviewer.cpp
# indra/newview/lldrawpool.cpp
# indra/newview/lldrawpoolalpha.cpp
# indra/newview/lldrawpoolbump.cpp
# indra/newview/lldrawpoolmaterials.cpp
# indra/newview/llfeaturemanager.cpp
# indra/newview/llfloaterpreference.cpp
# indra/newview/llfloaterpreferencesgraphicsadvanced.cpp
# indra/newview/llglsandbox.cpp
# indra/newview/llperfstats.cpp
# indra/newview/llviewercontrol.cpp
# indra/newview/llviewerdisplay.cpp
# indra/newview/llvovolume.cpp
# indra/newview/pipeline.cpp
# indra/newview/skins/default/xui/en/floater_adjust_environment.xml
# indra/newview/skins/default/xui/en/menu_viewer.xml
# indra/newview/skins/default/xui/en/notifications.xml
# indra/newview/skins/default/xui/en/panel_performance_preferences.xml
# indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml
# indra/newview/skins/default/xui/en/panel_settings_sky_atmos.xml
|
2023-04-29 23:32:04 +02:00 |
|
Brad Linden
|
dc813181a5
|
More post-merge fixes after DRTVWR-559 & DRTVWR-539 merge
|
2023-04-27 13:51:42 -07:00 |
|
Ansariel
|
45fdf20c3d
|
Merge branch 'DRTVWR-559' of https://github.com/secondlife/viewer
# Conflicts:
# autobuild.xml
# indra/newview/app_settings/settings.xml
# indra/newview/llviewercontrol.cpp
# indra/newview/pipeline.cpp
|
2023-04-21 18:32:34 +02:00 |
|
Ansariel
|
9ffb2514db
|
Merge branch 'DRTVWR-559' of https://github.com/secondlife/viewer
# Conflicts:
# indra/cmake/00-Common.cmake
# indra/newview/app_settings/settings.xml
# indra/newview/installers/windows/installer_template.nsi
# indra/newview/llviewermenu.cpp
# indra/newview/pipeline.cpp
# indra/newview/skins/default/xui/en/menu_viewer.xml
|
2023-04-17 10:01:32 +02:00 |
|
Ansariel
|
95e73bf131
|
Merge branch 'DRTVWR-559' of https://github.com/secondlife/viewer
# Conflicts:
# indra/newview/app_settings/settings.xml
# indra/newview/featuretable.txt
# indra/newview/featuretable_mac.txt
# indra/newview/llviewermedia.cpp
|
2023-03-31 17:03:50 +02:00 |
|
Ansariel
|
5323ccf3b3
|
Merge branch 'DRTVWR-559' of https://github.com/secondlife/viewer
# Conflicts:
# indra/llcommon/llprofiler.h
# indra/llcommon/llprofilercategories.h
# indra/llcommon/lluuid.cpp
# indra/newview/app_settings/settings.xml
# indra/newview/featuretable.txt
# indra/newview/llagent.cpp
# indra/newview/llface.cpp
# indra/newview/llviewerobject.cpp
# indra/newview/llviewertexture.cpp
|
2023-03-20 11:14:08 +01:00 |
|
Ansariel
|
f4182ddc7f
|
Merge branch 'DRTVWR-559' of https://github.com/secondlife/viewer
# Conflicts:
# indra/newview/app_settings/settings.xml
# indra/newview/llreflectionmapmanager.cpp
# indra/newview/llspatialpartition.cpp
# indra/newview/llviewercontrol.cpp
# indra/newview/llviewerdisplay.cpp
# indra/newview/llviewermenu.cpp
# indra/newview/llviewershadermgr.cpp
# indra/newview/llworldmapview.cpp
# indra/newview/pipeline.cpp
# indra/newview/skins/default/xui/en/panel_tools_texture.xml
|
2023-03-06 17:11:43 +01:00 |
|
Ansariel
|
ca5c9c9215
|
Merge branch 'DRTVWR-559' of https://github.com/secondlife/viewer
# Conflicts:
# indra/newview/app_settings/settings.xml
# indra/newview/app_settings/shaders/class1/deferred/multiSpotLightF.glsl
# indra/newview/app_settings/shaders/class1/deferred/softenLightF.glsl
# indra/newview/app_settings/shaders/class1/deferred/spotLightF.glsl
# indra/newview/lldrawpoolbump.cpp
# indra/newview/lldrawpoolground.cpp
# indra/newview/lldrawpoolterrain.cpp
# indra/newview/lldrawpooltree.cpp
# indra/newview/llviewershadermgr.cpp
|
2023-02-04 15:17:29 +01:00 |
|
Ansariel
|
d8eecb462a
|
Merge branch 'DRTVWR-559' of https://github.com/secondlife/viewer
# Conflicts:
# indra/newview/app_settings/settings.xml
# indra/newview/app_settings/shaders/class1/interface/glowcombineF.glsl
# indra/newview/llface.cpp
# indra/newview/llselectmgr.cpp
# indra/newview/llviewerdisplay.cpp
# indra/newview/pipeline.cpp
|
2023-02-03 20:26:22 +01:00 |
|
Ansariel
|
6cbca4da71
|
Merge branch 'DRTVWR-559' of https://github.com/secondlife/viewer
# Conflicts:
# indra/llcommon/llprofiler.h
# indra/llcommon/lluuid.cpp
# indra/llprimitive/llmodel.cpp
# indra/llrender/llrendertarget.cpp
# indra/newview/app_settings/settings.xml
# indra/newview/app_settings/shaders/class1/deferred/multiPointLightF.glsl
# indra/newview/app_settings/shaders/class1/deferred/pointLightF.glsl
# indra/newview/llviewerwindow.cpp
# indra/newview/pipeline.cpp
# indra/newview/skins/default/xui/da/floater_about.xml
# indra/newview/skins/default/xui/de/floater_about.xml
# indra/newview/skins/default/xui/en/floater_about.xml
# indra/newview/skins/default/xui/es/floater_about.xml
# indra/newview/skins/default/xui/fr/floater_about.xml
# indra/newview/skins/default/xui/it/floater_about.xml
# indra/newview/skins/default/xui/pt/floater_about.xml
# indra/newview/skins/default/xui/ru/floater_about.xml
# indra/newview/skins/default/xui/tr/floater_about.xml
# indra/newview/skins/default/xui/zh/floater_about.xml
|
2023-02-01 11:40:17 +01:00 |
|
Ansariel
|
b4fde14f09
|
Merge branch 'DRTVWR-559' of https://github.com/secondlife/viewer
# Conflicts:
# indra/llrender/llimagegl.cpp
# indra/llrender/llrender.cpp
# indra/llrender/llvertexbuffer.cpp
# indra/llrender/llvertexbuffer.h
# indra/newview/app_settings/settings.xml
# indra/newview/llappviewer.cpp
# indra/newview/lldrawpool.cpp
# indra/newview/lldrawpoolalpha.cpp
# indra/newview/lldrawpoolavatar.cpp
# indra/newview/lldrawpoolbump.cpp
# indra/newview/lldrawpooltree.cpp
# indra/newview/llface.cpp
# indra/newview/llmodelpreview.cpp
# indra/newview/llspatialpartition.h
# indra/newview/llviewerdisplay.cpp
# indra/newview/llviewertexturelist.cpp
# indra/newview/llviewerwindow.cpp
# indra/newview/llvovolume.cpp
# indra/newview/pipeline.cpp
|
2023-01-19 23:04:50 +01:00 |
|
Ansariel
|
d3cf982c3c
|
Update Linux feature table
|
2022-12-23 11:23:46 +01:00 |
|
Ansariel
|
90b73522b1
|
Update featuretable_linux.txt accordingly
|
2022-12-08 17:32:59 +01:00 |
|
Ansariel
|
b80fefa0ab
|
Merge branch 'DRTVWR-559' of https://bitbucket.org/lindenlab/viewer
# Conflicts:
# indra/newview/CMakeLists.txt
# indra/newview/app_settings/settings.xml
# indra/newview/featuretable.txt
# indra/newview/featuretable_mac.txt
# indra/newview/llfloaterpreference.cpp
# indra/newview/llviewerdisplay.cpp
# indra/newview/skins/default/xui/en/floater_preferences_graphics_advanced.xml
|
2022-10-13 13:33:56 +02:00 |
|
Ansariel
|
5763aa32cc
|
Merge branch 'DRTVWR-559' of https://bitbucket.org/lindenlab/viewer
# Conflicts:
# indra/newview/llreflectionmapmanager.cpp
# indra/newview/llsettingsvo.cpp
# indra/newview/llviewerdisplay.cpp
# indra/newview/llviewerwindow.cpp
# indra/newview/pipeline.cpp
|
2022-10-12 16:25:18 +02:00 |
|
Ansariel
|
c3eb62664b
|
Merge branch 'DRTVWR-559' of https://bitbucket.org/lindenlab/viewer
# Conflicts:
# indra/newview/app_settings/settings.xml
# indra/newview/app_settings/shaders/class1/deferred/fullbrightShinyV.glsl
# indra/newview/featuretable.txt
# indra/newview/featuretable_mac.txt
# indra/newview/llpanelface.cpp
# indra/newview/llreflectionmapmanager.cpp
# indra/newview/pipeline.cpp
# indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml
|
2022-09-26 15:21:07 +02:00 |
|
Andrey Kleshchev
|
0a6c317f11
|
SL-16156 Clean up unused RenderAvatarVP
|
2022-09-08 22:59:15 +03:00 |
|
Ansariel
|
3f145c0c3f
|
Merge branch 'master' of https://vcs.firestormviewer.org/viewer-merges/phoenix-firestorm-563
# Conflicts:
# indra/llcommon/llframetimer.cpp
# indra/llcommon/llprofiler.h
# indra/newview/pipeline.cpp
# indra/newview/skins/default/xui/de/panel_preferences_graphics1.xml
# indra/newview/skins/default/xui/en/floater_preferences_graphics_advanced.xml
# indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml
|
2022-08-30 22:17:59 +02:00 |