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 |
|
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 |
|
Ansariel
|
8ecf3fd9e4
|
Merge branch 'DRTVWR-559' of https://bitbucket.org/lindenlab/viewer
|
2022-08-03 19:45:45 +02:00 |
|
Ansariel
|
ffb75050fd
|
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
|
2022-08-02 15:27:10 +02:00 |
|
Zi Ree
|
1f81f59409
|
Add support for shared OpenGL contexts when using SDL2 for multithreaded OpenGL image processing
|
2022-07-28 17:53:47 +02:00 |
|
Ansariel
|
6f7d07c6e6
|
Merge branch 'master' of https://vcs.firestormviewer.org/viewer-merges/phoenix-firestorm-546
|
2022-06-18 15:52:15 +02:00 |
|
Ansariel
|
7d904ef68b
|
Let's just do this...
|
2022-06-11 16:45:08 +02:00 |
|
Ansariel
|
c5d9c3c2a7
|
Merge branch 'DRTVWR-563' of https://bitbucket.org/lindenlab/viewer
# Conflicts:
# indra/cmake/Tracy.cmake
# indra/llcommon/llprofiler.h
# indra/llcommon/llqueuedthread.cpp
# indra/llimage/llimageworker.cpp
# indra/llimagej2coj/llimagej2coj.cpp
# indra/llkdu/llimagej2ckdu.cpp
# indra/llrender/llimagegl.cpp
# indra/llrender/llimagegl.h
# indra/llwindow/llwindowwin32.cpp
# indra/newview/app_settings/settings.xml
# indra/newview/featuretable_mac.txt
# indra/newview/llappviewer.cpp
# indra/newview/llfloaterpreference.cpp
# indra/newview/llmeshrepository.cpp
# indra/newview/lltexturefetch.cpp
# indra/newview/llviewercontrol.cpp
# indra/newview/llviewertexture.cpp
# indra/newview/llviewertexture.h
# indra/newview/llviewertexturelist.cpp
# indra/newview/llviewertexturelist.h
# indra/newview/llviewerwindow.cpp
# indra/newview/skins/default/xui/en/floater_preferences_graphics_advanced.xml
# indra/newview/skins/default/xui/en/floater_texture_fetch_debugger.xml
|
2022-06-03 15:07:06 +02:00 |
|
Ansariel
|
47e2173239
|
Merge branch 'DRTVWR-546' of https://bitbucket.org/lindenlab/viewer
# Conflicts:
# indra/llrender/llgl.cpp
# indra/llwindow/llwindowwin32.cpp
# indra/newview/app_settings/settings.xml
# indra/newview/featuretable.txt
# indra/newview/featuretable_mac.txt
# indra/newview/lldrawpoolalpha.cpp
# indra/newview/lldynamictexture.cpp
# indra/newview/llviewerdisplay.cpp
# indra/newview/pipeline.cpp
# indra/newview/pipeline.h
|
2021-12-16 08:42:54 +01:00 |
|
Ansariel
|
14fb8f66f8
|
Merge branch 'DRTVWR-516-maint' of https://bitbucket.org/lindenlab/viewer
|
2020-09-24 16:34:12 +02:00 |
|
Andrey Kleshchev
|
f6bc93ceed
|
SL-13971 [Cleanup] Viewer complains about missing VertexShaderEnable
|
2020-09-22 19:27:46 +03:00 |
|
Ansariel
|
1733550573
|
Merge viewer-eep
|
2018-09-22 00:42:04 +02:00 |
|
Graham Linden
|
a21fa8664b
|
SL-1127 fix sky tex update with EEP interpolation getting confused
Disable RenderUseAdvancedAtmospherics in feature table to prevent Ultra from turning it on before its time.
|
2018-09-13 00:34:24 +01:00 |
|
Graham Linden
|
e075c65ee2
|
First pass at preferences and feature table hookup for advanced atmospherics.
|
2018-09-10 16:43:49 +01:00 |
|
Ansariel
|
40f8fa3637
|
With all the meshes with high res textures flying around nowadays this seems to be a good idea...
|
2017-03-25 14:31:49 +01:00 |
|
Ansariel
|
61a5c943ba
|
MAINT-6432 Fix defaults for RenderAvatarMaxComplexity
The 'all' section must be set to the value for high end machines as the minimum of high-end and recommended setting will be applied
|
2016-05-22 20:32:27 +02:00 |
|
Ansariel
|
0b4fb987c7
|
Fix defaults for RenderAvatarMaxComplexity: The 'all' section must be set to the value for high end machines as the minimum of high-end and recommended setting will be applied
|
2016-05-22 20:32:27 +02:00 |
|
Ansariel
|
14f0ed0144
|
Merge viewer-quickgraphics
|
2016-05-02 09:41:12 +02:00 |
|
Oz Linden
|
f495ca8f1a
|
Adjust some avatar complexity defaults (mostly slightly upwards)
Make more settings between mac and windows the same
Remove solaris and xp featuretables, since we don't support them any more
|
2016-04-29 10:52:43 -04:00 |