c4333e2222
Merge branch 'develop' of https://github.com/secondlife/viewer
...
# Conflicts:
# indra/llinventory/llsettingssky.cpp
# indra/newview/llviewertexturelist.cpp
# indra/newview/skins/default/xui/en/floater_world_map.xml
2025-06-16 12:55:12 +02:00
3f4d28329f
Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm
2025-06-15 17:58:08 +02:00
9dab6cb238
Fixed adding skies to day cycle by ensuring mAbsorptionConfigs, mMieConfigs and mRayleightConfigs don't become null
2025-06-12 02:31:38 +10:00
86a8f5a558
Fixed adding skies to day cycle by ensuring mAbsorptionConfigs, mMieConfigs and mRayleightConfigs don't become null
2025-06-10 21:47:56 +03:00
4cfdea8395
Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm
...
# Conflicts:
# indra/newview/skins/default/xui/zh/strings.xml
2025-06-07 17:50:44 +02:00
4b40399d3f
Adds missing ambient color blending to day cycle
2025-06-03 01:49:29 +10:00
6291e86bf2
Adds missing ambient color blending to day cycle
2025-06-02 16:48:44 +03:00
aa1c1cb874
import [ #4185 ] Fix sky ambient color not blending during day cycle
2025-05-29 00:35:33 +01:00
cf2f48de06
Merge branch 'release/2025.04' of https://github.com/secondlife/viewer
...
# Conflicts:
# indra/llui/llflatlistview.cpp
# indra/llui/llstyle.cpp
# indra/llui/llstyle.h
# indra/llui/lltextbase.cpp
# indra/llui/llurlmatch.cpp
# indra/llui/llurlmatch.h
# indra/llui/llurlregistry.cpp
# indra/llui/llurlregistry.h
# indra/newview/llavatarlist.cpp
# indra/newview/llavatarlist.h
# indra/newview/llavatarlistitem.cpp
# indra/newview/llavatarlistitem.h
# indra/newview/llfloaternewfeaturenotification.cpp
# indra/newview/llinventorybridge.cpp
# indra/newview/llmeshrepository.cpp
# indra/newview/llpanelprofile.cpp
# indra/newview/llviewerchat.cpp
# indra/newview/llviewerfloaterreg.cpp
# indra/newview/llvovolume.cpp
# indra/newview/skins/default/colors.xml
2025-04-26 00:31:04 +02:00
206f8d9e01
#3863 Ensure cloud texture selection updates the sky
2025-04-15 21:40:17 +03:00
fe41087069
Merge branch 'release/2024.12-ForeverFPS' of https://github.com/secondlife/viewer
2025-02-19 15:20:09 +01:00
8114850e94
#3511 fix for PBR skies being too bright on Low Graphics
2025-02-18 11:33:32 +02:00
926c22e1b9
Merge branch 'release/2024.12-ForeverFPS' of https://github.com/secondlife/viewer
...
# Conflicts:
# indra/llrender/llfontfreetype.cpp
# indra/newview/llstartup.cpp
2025-01-07 13:56:32 +01:00
a27515748f
#3311 RenderSkyAutoAdjustLegacy does not engage tonemapper
2025-01-02 20:55:17 +02:00
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
c02baded84
#3170 Fix for tonemapping not working with PBR skies.
2024-11-28 17:57:30 -05:00
1b4814f0e5
viewer#3170 Fix tonemaping slider
...
At the moment slider is in general settings, not per environment
2024-11-29 00:12:27 +02:00
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
d65fb7cec8
Drop emissive on old Intel GPUs ( #3110 )
...
* #3103 Add the ability to disable the emissive buffer for older GPUs with low memory bandwidth.
* #3135 Add a "vintage" mode for slower GPUs
* #2719 Fix for skies being overbrightened
* #2632 Do not apply tonemapping on legacy skies
2024-11-25 20:56:03 -05:00
82e37d1dfc
Merge branch 'release/2024.09-ExtraFPS' of https://github.com/secondlife/viewer
...
# Conflicts:
# indra/newview/llmodelpreview.cpp
2024-10-07 10:34:08 +02:00
3904a15c63
viewer#2705 Some sky parameters weren't updating
2024-10-02 19:26:28 +03:00
1cca913ba7
Merge branch 'develop' of https://github.com/secondlife/viewer
...
# Conflicts:
# indra/cmake/CMakeLists.txt
# indra/llprimitive/lldaeloader.cpp
# indra/llprimitive/llmodelloader.cpp
# indra/llrender/llgl.h
# indra/llrender/llrender.h
# indra/llui/llurlentry.cpp
# indra/llui/llurlentry.h
# indra/newview/llviewerdisplay.cpp
# indra/newview/llvoavatar.cpp
2024-09-13 18:54:12 +02:00
e71215dcfd
viewer#2529 Optimize LLSettingsWater::blend
2024-09-12 18:45:06 +03:00
dfff269d83
viewer#2529 Optimize LLSettingsSky::blend
2024-09-11 22:56:58 +03:00
0a110ff083
viewer#2529 Track interpolateSDMap's performance
...
viewer#2529 Fix initialization
2024-09-11 22:56:57 +03:00
047eb16f4c
viewer#2529 Optimize updateGLVariablesForSettings
...
Intent is to eventually use only stored variables for everything.
LLSD operations are far too expensive.
2024-09-11 14:09:01 +03:00
088cc2ea35
Merge branch 'develop' of https://github.com/secondlife/viewer
...
# Conflicts:
# indra/llcommon/llpointer.h
# indra/llcommon/llqueuedthread.cpp
# indra/llfilesystem/llfilesystem.cpp
# indra/llui/llconsole.cpp
# indra/llui/llkeywords.cpp
# indra/llui/llstatgraph.cpp
# indra/llui/llvirtualtrackball.cpp
# indra/newview/llagentcamera.cpp
# indra/newview/llappviewer.cpp
# indra/newview/llfloateremojipicker.cpp
# indra/newview/llfloaterimnearbychathandler.cpp
# indra/newview/llfloatersettingsdebug.cpp
# indra/newview/llfloatersnapshot.cpp
# indra/newview/llglsandbox.cpp
# indra/newview/llnetmap.cpp
# indra/newview/llpanelface.cpp
# indra/newview/llpanelpermissions.cpp
# indra/newview/llpanelplaceprofile.cpp
# indra/newview/llstartup.cpp
# indra/newview/llviewermessage.cpp
# indra/newview/llvocache.cpp
# indra/newview/llworldmapview.cpp
2024-07-09 02:25:42 +02:00
9fdca96f8b
Re-enable compiler warnings C4244 and C4396 except for lltracerecording.h and llunittype.h for now
2024-07-08 20:27:14 +02:00
343aeeeb36
Merge remote-tracking branch 'LGPL/master'
...
# Conflicts:
# doc/contributions.txt
# indra/newview/skins/default/xui/de/panel_preferences_graphics1.xml
2024-05-16 02:11:51 +02:00
d9153532b8
Merge branch 'main' into marchcat/x-mf-merge
...
# Conflicts:
# doc/contributions.txt
# indra/newview/llfloaterimagepreview.cpp
2024-05-15 12:51:21 +03:00
b06a99f7c7
Post-merge spaces fix
2024-05-15 12:47:27 +03:00
5f1a19af72
Merge remote-tracking branch 'LL/marchcat/x-ws-merge'
...
# Conflicts:
# autobuild.xml
# indra/linux_crash_logger/llcrashloggerlinux.cpp
# indra/newview/llappviewerlinux_api.h
# indra/newview/llappviewerlinux_api_dbus.cpp
# indra/newview/llappviewerlinux_api_dbus.h
# indra/newview/llavatarpropertiesprocessor.h
# indra/newview/llcallbacklist.cpp
# indra/newview/llimpanel.h
2024-05-01 12:30:57 +02:00
38c2a5bde9
Merge branch 'marchcat/w-whitespace' into marchcat/x-ws-merge
2024-05-01 08:16:58 +03:00
1b68f71348
#824 Process source files in bulk: replace tabs with spaces, convert CRLF to LF, and trim trailing whitespaces as needed
2024-04-29 07:56:09 +03:00
9b30bc68c1
Merge branch 'DRTVWR-591-maint-X' of https://github.com/secondlife/viewer
...
# Conflicts:
# indra/fix-incredibuild.py
# indra/newview/app_settings/settings.xml
# indra/newview/llcontrolavatar.cpp
# indra/newview/lloutfitslist.cpp
2024-04-12 19:36:23 +02:00
f0fd47b68e
Merge branch 'release/materials_featurette' of https://github.com/secondlife/viewer
...
# Conflicts:
# indra/newview/app_settings/settings.xml
2024-04-10 03:06:52 +02:00
92efb16039
#854 Fix for skies that shouldn't be auto-adjusted getting auto-adjusted. ( #1115 )
2024-04-02 15:27:22 -05:00
4c7a139e09
Fix the bogus, zero cloud scroll rate in default EE sky settings.
...
Obvioulsy, there has been a typo done when copying WL default sky parameters to EE ones.
This causes "static" and quite unrealistic clouds when this default setting is used as a
base for a new sky setting, and we see this bad static sky resurfacing now with PBR and
its "adjusted" (more like hacked, but this is another story) mid-day sky setting.
Let's fix this typo once and for all in LL's code base (most TPVs have it fixed already,
and this ever since EEP got released).
@LL: please also fix the cloud scroll rate in the PBR mid-day inventory setting accordingly.
2024-04-01 20:02:38 +03:00
70db255e02
Merge branch 'master' of https://vcs.firestormviewer.org/viewer-merges/phoenix-firestorm-ll-master
...
# Conflicts:
# .github/workflows/build.yaml
# autobuild.xml
# indra/llcommon/llerror.cpp
# indra/llcommon/tests/workqueue_test.cpp
# indra/newview/VIEWER_VERSION.txt
2023-10-27 11:52:59 +02:00
39a6735fc9
Merge branch 'main' of https://github.com/secondlife/viewer
...
# Conflicts:
# .gitignore
# autobuild.xml
# indra/cmake/APR.cmake
# indra/newview/CMakeLists.txt
# indra/newview/installers/windows/installer_template.nsi
# indra/newview/viewer_manifest.py
# indra/test/namedtempfile.h
2023-10-26 15:49:12 +02:00
673b3309dd
Merge remote-tracking branch 'origin/main' into DRTVWR-559
2023-10-25 16:12:13 -07:00
0514918bed
Merge branch 'DRTVWR-559' of https://github.com/secondlife/viewer
...
# Conflicts:
# indra/newview/app_settings/settings.xml
# scripts/messages/message_template.msg.sha1
2023-09-21 18:34:10 +02:00
1514ade10d
SL-19842 WIP -- Now that probes can override ambient, unroll ambient darkening hacks.
2023-09-11 09:20:00 -05:00
894c9e0417
SL-19842 WIP -- Move sky auto adjustment magic numbers to debug settings.
2023-08-22 13:17:58 -05:00
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
ddc6d21958
SL-18837: Followup to 19e9e8c: global Boost.Bind placeholders
...
do not need 'using' directive, given BOOST_BIND_GLOBAL_PLACEHOLDERS.
2023-06-05 21:47:52 -04:00
6d2d0c8ee5
SL-18837: Boost.Bind _1, _2 placeholders are no longer global.
...
This was a longstanding complaint: that Boost shouldn't dump the (somewhat
mysterious) _1, _2 et al. names into the global namespace. Recent Boost has
fixed that, requiring 'using namespace boost::placeholders;' if you want to
use them unqualified.
2023-06-02 17:27:57 -04:00
Ansariel