Ansariel
|
d927ba575a
|
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
# Conflicts:
# indra/llcommon/llqueuedthread.cpp
# indra/llcommon/llqueuedthread.h
# indra/llcommon/lluuid.cpp
# indra/llcommon/llworkerthread.cpp
# indra/llimage/llimageworker.h
# indra/newview/VIEWER_VERSION.txt
# indra/newview/llappviewer.cpp
# indra/newview/llappviewerwin32.cpp
# indra/newview/llfilepicker.cpp
# indra/newview/lltexturefetch.cpp
# indra/newview/llviewerdisplay.cpp
# indra/newview/llviewermenu.cpp
|
2023-05-17 21:40:54 +02:00 |
|
Ansariel
|
2a6c81f1d6
|
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
|
2023-05-02 17:52:00 +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
|
97c6bf8f74
|
Readded RenderClass1MemoryBandwidth setting after DRTVWR-559 & DRTVWR-539 merge
Has to use class1 now since class0 shouldn't ever be in use on
end-user systems anymore.
|
2023-04-27 18:04:49 -07:00 |
|
Ansariel
|
ffa21ae649
|
Merge branch 'master' of https://vcs.firestormviewer.org/viewer-merges/phoenix-firestorm-539
# Conflicts:
# autobuild.xml
# indra/newview/app_settings/settings.xml
# indra/newview/featuretable_linux.txt
# indra/newview/fsfloaterperformance.cpp
# 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/llperfstats.cpp
# indra/newview/llperfstats.h
# indra/newview/llviewercontrol.cpp
# indra/newview/llviewerdisplay.cpp
# indra/newview/llviewertexturelist.cpp
# indra/newview/llvovolume.cpp
# indra/newview/pipeline.cpp
|
2023-04-28 00:39:47 +02:00 |
|
Brad Linden
|
dc813181a5
|
More post-merge fixes after DRTVWR-559 & DRTVWR-539 merge
|
2023-04-27 13:51:42 -07:00 |
|
Brad Linden
|
513ac361b1
|
Got things to compile again after DRTVWR-559 & DRTVWR-539 merge.
removing dead code and references to members that don't exist anymore
|
2023-04-26 17:34:43 -07:00 |
|
Brad Linden
|
369945b45d
|
Merge remote-tracking branch 'origin/DRTVWR-539' into DRTVWR-559-merge-539
|
2023-04-26 15:38:47 -07: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 |
|
Jonathan "Geenz" Goodman
|
6c554c9c92
|
Fix up the graphics setting detection
SL-18563
|
2023-03-27 15:06:25 -07:00 |
|
Ansariel
|
1772ae4c6c
|
Merge branch 'DRTVWR-577-maint-S' of https://github.com/secondlife/viewer
# Conflicts:
# indra/newview/app_settings/settings.xml
# indra/newview/llappviewerwin32.cpp
# indra/newview/skins/default/xui/en/floater_about_land.xml
# indra/newview/skins/default/xui/en/panel_preferences_chat.xml
|
2023-03-07 14:21:43 +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 |
|
akleshchev
|
d611734c04
|
SL-15752 Reduce default graphical quality on machines with little memory (#105)
|
2023-03-04 02:29:48 +02:00 |
|
Dave Parks
|
d5e558fffc
|
SL-19277 Fix for fallback probe sometimes getting occluded and making void water dark after teleport. Never default to having reflections off.
|
2023-02-28 08:49:15 -06: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 |
|
Dave Parks
|
10b8dcc497
|
SL-19015 Bump probe resolution back to 256 by default (drop to 128 if vram < 2GB), remove irradiance map feedback loop (one bounce, but but more stable and allows for much brighter first bounce), make sky contribution to irradiance not tint the world blue. Make irradiance that appears in radiance maps match world irradiance.
|
2023-01-30 18:56:19 -06: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 |
|
Dave Parks
|
e5d463ca20
|
SL-17705 Backwards compatibility pass. Support OpenGL pre-4.0 by disabling reflection probes and anti-aliasing. Get render parity with current release viewer when reflection probes are disabled.
|
2022-09-22 17:27:18 -05:00 |
|
Ansariel
|
9756e0e89e
|
Merge branch 'DRTVWR-559' of https://bitbucket.org/lindenlab/viewer
# Conflicts:
# indra/llrender/llgl.cpp
# indra/llrender/llimagegl.cpp
# indra/llrender/llrender.cpp
# indra/newview/app_settings/settings.xml
# indra/newview/lldynamictexture.cpp
# indra/newview/llface.cpp
# indra/newview/llfloaterpreference.cpp
# indra/newview/llviewermenu.cpp
# indra/newview/llviewerwindow.cpp
|
2022-09-17 12:02:14 +02:00 |
|
Dave Parks
|
8dc59e5ef3
|
SL-18128 Clear out much OpenGL cruft and switch to core profile on AMD
|
2022-09-16 16:25:26 -05:00 |
|
Ansariel
|
1f176fdc18
|
Merge branch 'DRTVWR-559' of https://bitbucket.org/lindenlab/viewer
# Conflicts:
# indra/llmath/llvolume.cpp
# indra/llrender/llglslshader.cpp
# indra/llrender/llpostprocess.cpp
# indra/llrender/llrender.cpp
# indra/newview/llpanelface.cpp
# indra/newview/lltexturectrl.cpp
# indra/newview/llvieweroctree.cpp
# indra/newview/llviewershadermgr.cpp
# indra/newview/skins/default/xui/en/floater_texture_ctrl.xml
|
2022-09-13 20:11:44 +02:00 |
|
Howard Stearns
|
013a713001
|
SL-17967 - slightly more meaningful ogl error reporting
|
2022-09-02 15:44:19 -07:00 |
|
Ansariel
|
d5303a3ccd
|
Merge branch 'master' of https://vcs.firestormviewer.org/viewer-merges/phoenix-firestorm-546
|
2022-04-26 17:21:45 +02:00 |
|
Mnikolenko Productengine
|
79c9a8a4b7
|
Merge branch 'DRTVWR-546' into DRTVWR-539
|
2022-04-26 16:03:03 +03:00 |
|
Ansariel
|
a775b9fc7f
|
Merge branch 'DRTVWR-546' of https://bitbucket.org/lindenlab/viewer
|
2022-04-19 15:49:47 +02:00 |
|
Dave Parks
|
9b2df75c87
|
SL-17077 Ensure profiling is disabled if gpu_benchmark fails. Log the source of the real crash for when the viewer inevitably crashes later.
|
2022-03-25 13:05:50 -05:00 |
|
Ansariel
|
7b32862d42
|
Merge branch 'DRTVWR-539' of https://bitbucket.org/lindenlab/viewer
|
2022-01-25 19:26:26 +01:00 |
|
Runitai Linden
|
9c7ec66d24
|
SL-16691 Add GPU memory bandwidth to ViewerStats
|
2022-01-24 11:04:11 -06:00 |
|
Ansariel
|
bfcfadcbcd
|
Merge branch 'DRTVWR-539' of https://bitbucket.org/lindenlab/viewer
|
2022-01-22 00:15:39 +01:00 |
|
Runitai Linden
|
f145d0dbe1
|
SL-16447 Adjust default graphics preferences based on modern memory bandwidth levels and bias settings based on CPU speed.
|
2022-01-21 16:18:54 -06: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 |
|
Mnikolenko Productengine
|
66d88733ee
|
SL-16454 FIXED Performance viewer login screen is black after a Release viewer session.
|
2021-12-07 19:15:50 +02:00 |
|
Dave Parks
|
5e5be92d79
|
SL-16202 Put Multi-threaded GL behind a feature flag and update featuretable (decruftify settings, compatibility pass).
|
2021-12-06 15:29:34 +00:00 |
|
Ansariel
|
7427b46ea5
|
Merge branch 'DRTVWR-546' of https://bitbucket.org/lindenlab/viewer
# Conflicts:
# .gitignore
# indra/cmake/Copy3rdPartyLibs.cmake
# indra/llcommon/llcommon.cpp
# indra/llcommon/llerror.cpp
# indra/llcommon/llprofiler.h
# indra/llcommon/llthread.cpp
# indra/llimage/llimageworker.cpp
# indra/llprimitive/llmodel.h
# indra/llrender/llfontgl.cpp
# indra/llrender/llfontgl.h
# indra/llrender/llgl.cpp
# indra/llrender/llvertexbuffer.cpp
# indra/llrender/llvertexbuffer.h
# indra/llwindow/llwindowmacosx.h
# indra/llwindow/llwindowwin32.cpp
# indra/llwindow/llwindowwin32.h
# indra/newview/app_settings/settings.xml
# indra/newview/llappviewer.cpp
# indra/newview/llappviewer.h
# indra/newview/lldrawpoolavatar.cpp
# indra/newview/lldrawpoolavatar.h
# indra/newview/lldynamictexture.cpp
# indra/newview/llfloatermodelpreview.cpp
# indra/newview/llimview.cpp
# indra/newview/llmeshrepository.h
# indra/newview/llmodelpreview.cpp
# indra/newview/llnetmap.cpp
# indra/newview/llskinningutil.cpp
# indra/newview/llskinningutil.h
# indra/newview/llspatialpartition.cpp
# indra/newview/llteleporthistory.cpp
# indra/newview/llviewerdisplay.cpp
# indra/newview/llviewerobject.cpp
# indra/newview/llviewerobjectlist.cpp
# indra/newview/llviewertexture.cpp
# indra/newview/llviewertexturelist.cpp
# indra/newview/llviewerwindow.cpp
# indra/newview/llvoicevivox.cpp
# indra/newview/llvosky.cpp
# indra/newview/llvovolume.cpp
|
2021-11-12 15:21:52 +01:00 |
|
Dave Houlton
|
3e99853b29
|
SL-16138 remove checks for now-mandatory capabilities
|
2021-10-06 10:59:00 -06:00 |
|
Ansariel
|
c516f1fc9a
|
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
|
2021-05-02 13:50:45 +02:00 |
|
Dave Houlton
|
2386125ae0
|
Merge master into DV525-merge-6.4.19
|
2021-04-29 11:40:22 -06:00 |
|
Ansariel
|
93f1998a47
|
Merge branch 'DRTVWR-525' of https://bitbucket.org/lindenlab/viewer
|
2021-01-08 23:06:41 +01:00 |
|
Ansariel
|
6c587d437d
|
Merge branch 'DRTVWR-515-maint' of https://bitbucket.org/lindenlab/viewer
|
2020-12-02 08:17:58 +01:00 |
|
Andrey Kleshchev
|
bb4d02446f
|
SL-14347 Crash at ChoosePixelFormat SEH
|
2020-12-01 18:22:24 +02:00 |
|
Dave Houlton
|
7cd076c796
|
DRTVWR-510 remove all LL_SOLARIS conditionals
|
2020-10-08 17:16:22 -06:00 |
|
Ansariel
|
3c158f981a
|
Merge DRTVWR-440
|
2020-01-31 12:44:28 +01:00 |
|
Dave Houlton
|
1c17e51279
|
DRTVWR-440, whitespace change to test TeamCity trigger
|
2020-01-22 13:06:57 -07:00 |
|
Ansariel
|
d79b79fbe2
|
Merge viewer-ordered-shutdown
|
2019-10-19 03:16:10 +02:00 |
|
andreykproductengine
|
24a0601a50
|
DRTVWR-493 Reworked a number of inits
|
2019-08-13 20:19:46 +03:00 |
|
Ansariel
|
1f02cfc1de
|
Merge viewer-neko
|
2018-08-16 14:51:06 +02:00 |
|
andreykproductengine
|
1197da3cdf
|
MAINT-8974 Reduce default settings for intel GPUs in case of failed benchmark
|
2018-08-09 15:57:48 +03:00 |
|
andreykproductengine
|
e236da41e9
|
MAINT-8197 Compliment benchmark crash processing with SEH handling
|
2018-08-06 19:56:44 +03:00 |
|
Ansariel
|
106d34da3a
|
Merge viewer-neko
|
2018-06-12 21:54:15 +02:00 |
|
Andrey Lihatskiy
|
1b23621756
|
Merged lindenlab/viewer-neko into default
|
2018-06-11 14:28:30 +03:00 |