ed67ca001c
Merge branch 'DRTVWR-559' of https://github.com/secondlife/viewer
...
# Conflicts:
# indra/newview/app_settings/logcontrol.xml
# indra/newview/app_settings/settings.xml
# indra/newview/llpanelface.cpp
# indra/newview/skins/default/xui/en/menu_viewer.xml
2023-08-09 11:05:56 +02:00
7a4b8edf9c
SL-20067 Make new default midday the new default sky setting
2023-07-28 18:10:40 -05:00
fe243a3042
Merge branch 'DRTVWR-559' of https://github.com/secondlife/viewer
...
# Conflicts:
# indra/newview/app_settings/settings.xml
# indra/newview/llmeshrepository.cpp
# indra/newview/llviewermenu.cpp
# indra/newview/llviewerobjectlist.cpp
# indra/newview/llvovolume.cpp
# indra/newview/llworld.cpp
# indra/newview/pipeline.cpp
# indra/newview/skins/default/xui/en/notifications.xml
2023-06-27 13:14:11 +02:00
3a1b60b2ba
SL-19785 Fix for blown out skies from Glow Focus. Add notification when editing legacy skies.
2023-06-22 17:10:24 -05:00
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
50ec54831d
DRTVWR-559 Revert skies to be very close to release and disable tone mapping when probe ambiance is zero.
...
Hack for desaturating legacy materials has been removed for performance and quality reasons.
Adds a new setting for auto adjusting legacy skies. This is the PBR "opt out" button. If disabled, legacy skies will disable tonemapping, automatic probe ambiance, and HDR/exposure. If enabled, legacy skies will behave as if probe ambiance and HDR scale are 1.0, and ambient will be cut in half.
HDR scale will act as a sky brightener, but will automatically adjust dynamic exposure so the sky will be properly exposed. If you want relatively even exposure all the time, set HDR Scale to 1.0. If you want a high range of exposures between indoor/dark areas and outdoor/bright areas, increase HDR Scale.
Also tuned up SSAO (thanks Rye!).
Reviewed with Brad.
2023-06-01 19:49:23 -05:00
9057bfc995
Merge branch 'DRTVWR-559' of https://github.com/secondlife/viewer
...
# Conflicts:
# indra/llcommon/llcallstack.h
# indra/llinventory/llsettingssky.cpp
# indra/llmath/llvolume.cpp
# indra/llwindow/llwindowwin32.cpp
# indra/newview/llappviewer.cpp
# indra/newview/llappviewerwin32.cpp
# indra/newview/llmeshrepository.cpp
# indra/newview/llmeshrepository.h
# indra/newview/llviewerstats.cpp
# indra/newview/llvoavatar.cpp
2023-05-05 12:35:33 +02:00
572d313bcf
DRTVWR-559 LLSD array build fix
2023-05-04 23:06:00 +03:00
a22d62e8ed
Merge remote-tracking branch 'origin/zap-LLSDArray' into DRTVWR-559
2023-05-04 11:39:03 -07:00
3c77c1b90f
DRTVWR-575: Replace some LLSDArray() usage with llsd::array().
...
It seems newer compilers have a different interpretation of exactly when to
engage LLSDArray's copy constructor. In particular, this assignment:
some_LLSD_map[key] = LLSDArray(...)(...)...;
used to convert the LLSDArray object directly to LLSD; now it first calls the
custom copy constructor, which embeds the intended array within an outer array
before assigning it into the containing map.
The newer llsd::array() function avoids that problem because what it returns
is already an LLSD object.
Taking inventory of LLSDArray assignments of that form turned up a number of
workarounds like LLSD(LLSDArray(...)). Replacing those with llsd::array() is
both simpler and more readable.
Tip of the hat to Chorazinallen for surfacing this issue!
(cherry picked from commit bb718155bd
2023-05-03 12:31:42 -04:00
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
d6b99cff8a
SL-19390 Make "Cloud Coverage" feedback into ambient when probe ambiance is zero and feedback into probe ambiance when probe ambiance is not zero.
2023-04-12 14:51:56 -05:00
b127e1bd12
SL-19538 Nudge sun brightness and replace "gamma" with an exposure scaler approximation
2023-04-06 18:58:24 -05:00
8385b6a7dd
Merge branch 'DRTVWR-559' of https://github.com/secondlife/viewer
...
# Conflicts:
# indra/newview/app_settings/settings.xml
# indra/newview/lldrawpoolalpha.cpp
# indra/newview/pipeline.cpp
# indra/newview/pipeline.h
2023-02-10 11:30:38 +01:00
055883beb5
SL-18780 Turn down contribution of cloud shadow to reflection probe ambiance and make the value a debug setting.
2023-02-07 12:59:38 -06:00
fc5119635b
Merge branch 'DRTVWR-559' of https://github.com/secondlife/viewer
...
# Conflicts:
# indra/newview/app_settings/settings.xml
# indra/newview/lldrawpoolalpha.cpp
# indra/newview/pipeline.cpp
2022-12-19 22:51:09 +01:00
d0af1ca7cb
SL-18780 Feedback cloud coverage into reflection probe ambiance to recover legacy behavior of cloud coverage brightening ambient lighting without destroying the ability to have good probe driven ambiance.
2022-12-16 13:35:16 -06:00
536e958018
Merge branch 'DRTVWR-559' of https://bitbucket.org/lindenlab/viewer
...
# Conflicts:
# autobuild.xml
# indra/newview/CMakeLists.txt
# indra/newview/llface.cpp
# indra/newview/llfilepicker.h
# indra/newview/llinventoryicon.cpp
# indra/newview/lltexturectrl.cpp
# indra/newview/llviewerobject.cpp
# indra/newview/llvovolume.cpp
# indra/newview/llvovolume.h
# indra/newview/pipeline.cpp
# indra/newview/skins/default/textures/textures.xml
# indra/newview/skins/default/xui/en/floater_inventory_view_finder.xml
2022-06-27 17:58:22 +02:00
929abcd296
SL-17523 Add reflection probe ambiance to windlight settings and integrate with UI and ReflectionMapManager
2022-06-10 16:36:38 -05:00
0a0e2fe93e
Merge branch 'DRTVWR-546' of https://bitbucket.org/lindenlab/viewer
2022-01-15 02:39:07 +01:00
2178d9fa57
SL-16606: Add profiler category ENVIRONMENT
2022-01-14 11:50:19 -08:00
c2f8517118
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2021-11-16 21:01:05 +01:00
353329c2c2
DRTVWR-546 merge in master v6.5.1
2021-11-16 11:44:55 -07:00
63cc972499
Merge branch 'DRTVWR-546' of https://bitbucket.org/lindenlab/viewer
...
# Conflicts:
# indra/llappearance/lldriverparam.h
# indra/llcommon/llmemory.h
# indra/llcommon/llprofiler.h
# indra/llrender/llvertexbuffer.cpp
# indra/llwindow/llwindow.cpp
# indra/llwindow/llwindowwin32.h
# indra/newview/app_settings/settings.xml
# indra/newview/lldrawable.cpp
# indra/newview/lldrawable.h
# indra/newview/lldrawpoolalpha.cpp
# indra/newview/lldrawpoolavatar.cpp
# indra/newview/lldrawpooltree.cpp
# indra/newview/lldrawpoolwater.cpp
# indra/newview/llface.cpp
# indra/newview/llinventoryfilter.cpp
# indra/newview/llselectmgr.h
# indra/newview/llspatialpartition.cpp
# indra/newview/llviewermenu.cpp
# indra/newview/llviewerobject.cpp
# indra/newview/llvieweroctree.cpp
# indra/newview/llviewertexturelist.cpp
# indra/newview/llvovolume.cpp
# indra/newview/llvowlsky.cpp
# indra/newview/pipeline.cpp
# indra/newview/skins/default/xui/en/floater_stats.xml
2021-11-12 17:31:39 +01:00
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
1be8a8d10b
Fix merge conflict
2021-10-29 15:11:42 -07:00
8d20480c5f
SL-16148 SL-16244 SL-16270 SL-16253 Remove most BlockTimers, remove LLMemTracked, introduce alignas, hook most/all reamining allocs, disable synchronous occlusion, and convert frequently accessed LLSingletons to LLSimpleton
2021-10-28 18:06:21 +00:00
ad91d0fd92
SL-16127: Make another pass removing redundant LLSD op [] calls, unused vars, and use atmospheric already calculated
2021-10-27 10:05:13 -07:00
aa7ca0aea1
Merged in SL-16127 (pull request #741 )
...
SL-16127
Approved-by: Euclid Linden
Approved-by: Dave Parks
2021-10-27 15:59:53 +00:00
a172c9d9cf
SL-16127: Replace slow getLightTransmittance with faster version
2021-10-21 16:46:06 -07:00
d2dce17803
SL-16197 Optimize LLEnvironment handling of shader uniforms. Instrument LLSD. Enable Fast Timers when Tracy is enabled to catch Fast Timer overhead.
2021-10-19 02:26:41 +00:00
339c3c5df4
Merge branch 'DRTVWR-522-maint' of https://bitbucket.org/lindenlab/viewer
2021-01-18 18:55:37 +01:00
ebffbd3c9a
SL-14575 Pass validation flags into EEP validators.
2021-01-13 20:47:20 +02:00
0242215384
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2020-07-13 20:17:27 +02:00
cfbc473327
Merge branch 'DRTVWR-497' of https://bitbucket.org/lindenlab/viewer
2020-07-08 17:00:49 +02:00
3068ea5781
FIRE-29682 [EEP] Allow full density multiplier range
2020-07-04 19:39:17 +01:00
9f0225abaa
SL-12978 Add note about similar code in C++ and GLSL
2020-07-01 13:42:23 -07:00
fb670069b0
Merge branch 'rlva/development' (v2.2.3 + v2.3.0 - both WIP)
2020-06-12 12:51:11 +02:00
fbd23878fc
Rewrite all @setenv related commands against the new atmospherics/environment class
2020-04-19 14:12:00 +01:00
0eac6816dd
Merge branch 'DRTVWR-440' of https://bitbucket.org/lindenlab/viewer
2020-02-26 20:45:28 +01:00
d16a79fc4c
SL-12741 Moon was using fixed color
2020-02-24 21:22:21 +02:00
2fb5e6e6b1
Merge viewer-eep
2020-01-08 00:24:24 +01:00
b3e11083cc
SL-11606 fix to match EEP light falloff vs release
2019-12-19 18:04:32 -07:00
c76bb4637b
Merge viewer-eep
2019-09-11 00:39:23 +02:00
ad26896a10
SL-11055
...
Remedy cloud_shadow and hack halving being done twice to ambient in some cases (i.e. artificial dimunition of necessary bullshit factor).
2019-08-27 12:49:18 -07:00
1e5830f55f
Merge viewer-eep
2019-08-26 21:51:36 +02:00
8960a56f53
SL-11776
...
Fix false alarming sky updates and doing expensive CPU work for same sky pixels.
2019-08-22 11:19:04 -07:00
b1cab5d246
SL-11212
...
Remove color clamping in determining sun diffuse and moonlight diffuse color from atmo settings.
2019-08-13 09:20:37 -07:00
69efafe064
Merge viewer-eep
2019-08-04 16:20:35 +02:00
53b71f0dc3
SL-11600
...
Make default direction when neither sun nor moon are up straight down instead of noon.
2019-07-24 13:45:03 -07:00
Ansariel