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
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
2bc4fb2bf0
Merge branch 'DRTVWR-567' of https://github.com/secondlife/viewer
...
# Conflicts:
# indra/llcommon/llqueuedthread.cpp
# indra/llcommon/llsdserialize.cpp
# indra/llcommon/llsdserialize.h
# indra/llcommon/llthreadsafequeue.h
# indra/llinventory/llsettingssky.cpp
# indra/llui/llfolderviewitem.cpp
# indra/llui/llview.h
# indra/newview/llaisapi.cpp
# indra/newview/llappviewer.cpp
# indra/newview/llfloaterproperties.cpp
# indra/newview/llfloaterproperties.h
# indra/newview/llinventorybridge.cpp
# indra/newview/llinventoryfunctions.cpp
# indra/newview/llinventorypanel.cpp
# indra/newview/llpanelmaininventory.cpp
# indra/newview/llpanelmaininventory.h
# indra/newview/llpanelmarketplaceinbox.cpp
# indra/newview/llpanelprofile.cpp
# indra/newview/llpanelprofile.h
# indra/newview/llpathfindingnavmesh.cpp
# indra/newview/llselectmgr.cpp
# indra/newview/llsidepanelinventory.cpp
# indra/newview/llsidepanelinventory.h
# indra/newview/llsidepaneliteminfo.cpp
# indra/newview/llsidepaneltaskinfo.cpp
# indra/newview/llviewerfloaterreg.cpp
# indra/newview/skins/default/xui/da/floater_inventory_item_properties.xml
# indra/newview/skins/default/xui/de/floater_inventory_item_properties.xml
# indra/newview/skins/default/xui/en/floater_inventory_item_properties.xml
# indra/newview/skins/default/xui/en/menu_inventory_gear_default.xml
# indra/newview/skins/default/xui/en/panel_main_inventory.xml
# indra/newview/skins/default/xui/en/panel_profile_firstlife.xml
# indra/newview/skins/default/xui/en/panel_profile_secondlife.xml
# indra/newview/skins/default/xui/en/sidepanel_inventory.xml
# indra/newview/skins/default/xui/en/sidepanel_item_info.xml
# indra/newview/skins/default/xui/en/sidepanel_task_info.xml
# indra/newview/skins/default/xui/es/floater_inventory_item_properties.xml
# indra/newview/skins/default/xui/fr/floater_inventory_item_properties.xml
# indra/newview/skins/default/xui/it/floater_inventory_item_properties.xml
# indra/newview/skins/default/xui/ja/floater_inventory_item_properties.xml
# indra/newview/skins/default/xui/pl/floater_inventory_item_properties.xml
# indra/newview/skins/default/xui/ru/floater_inventory_item_properties.xml
2023-02-13 23:35:21 +01:00
bb718155bd
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!
2023-01-03 18:06:45 -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
e35efb2754
Merged Fix double vs float complaint from visual studio.
2019-07-13 12:24:46 +00:00
02c3d2fe9b
Merge viewer-eep
2019-07-12 21:08:13 +02:00
d23bf2c16e
SL-11541 WIP
...
Make LLSettingsSky::gammaCorrect work like the soft scale clip and gamma correct from release.
Add transmittance effects to the low-end sky tex gen.
2019-07-10 13:02:09 -07:00
fe7bedd71d
Fix double vs float complaint from visual studio.
...
--HG--
branch : Chris-Rehor/fix-double-vs-float-complaint-from-visua-1561202648460
2019-06-22 11:25:41 +00:00
ccea567c08
Merge viewer-eep
2019-06-19 20:20:14 +02:00
ef5d4bc5af
Merge
2019-06-03 11:58:38 -07:00
16d3279995
SL-10966
...
Fix light atten and transmittance calcs breaking ambient color contrib to fog.
Needs to be tested on DRTSIM-415 or better to get legacy viewer settings that match EEP.
2019-06-03 11:30:41 -07:00
5927515212
SL-11117: Set default sky asset ID to A-12PM
2019-05-31 09:24:30 -07:00
2f2cf6d855
SL-10969
...
Modify ambient handling and forward projector lighting again to stamp out alpha fires.
2019-05-29 15:57:24 -07:00
e9dbee0026
SL-11238
...
Fix ambient light inputs to the renderer.
Fix 3rd sky shader w/ mistaken density mod conversion.
Make ambient clamp apply to all modes.
Tune ALM ambient clamp to match non-ALM.
2019-05-21 16:00:45 -07:00
0ec08c1b0f
Merge viewer-eep
2019-05-21 18:22:45 +02:00
b3c0218a31
Revert lighting changes for 10856 causing knock-on.
2019-05-16 14:14:02 -07:00
a984c5e66a
Merge
2019-05-14 07:57:35 -07:00
041d92b6bd
Force file update.
2019-05-14 07:56:41 -07:00
Ansariel