ce9d66cdd1
Merge branch develop into 2025.06
...
# Conflicts:
# indra/newview/llvoavatar.cpp
2025-08-06 16:05:19 +03:00
3b8b408b90
#3969 Make inventory creation from cache faster
...
Still has a lot of space for improvements, but should be 2.5 times faster
2025-07-28 11:48:53 +03: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
6291e86bf2
Adds missing ambient color blending to day cycle
2025-06-02 16:48:44 +03:00
b08ba3fa7b
Merge branch 'main' into marchcat/2505-merge
...
# Conflicts:
# .github/workflows/qatest.yaml
# indra/llcommon/llsdutil.h
# indra/llui/llflatlistview.h
# indra/newview/llinventorybridge.cpp
# indra/newview/lloutfitgallery.cpp
# indra/newview/lloutfitgallery.h
2025-05-28 21:38:00 +03:00
fe4f85e587
Merge remote-tracking branch 'origin/main' into geenz/2025.04-to-develop
2025-05-28 11:52:16 -04:00
2cbff073ed
#4000 Cherry pick inventory LEAP functions from develop branch
2025-05-20 20:40:04 +03:00
3de223aecf
#1300 Test coverage for inventory metadata
...
For now it's random, needs more consistent coverage
2025-05-05 18:28:08 +03:00
f73e0d09aa
#3905 Crashes in LLInventoryModel::saveToFile
...
I don't expect it to fix the problem. Just making things more explicit
in places of most frequent crashes.
2025-05-05 18:28:08 +03:00
ea96f7ac5e
More constexpr improvements and cleanup of includes of a deleted header file
2025-04-18 23:23:10 +03:00
9a333e65c4
Merge develop into release/2025.04
2025-04-18 21:36:56 +03:00
06a76eda6a
Merge branch 'develop' into marchcat/05-develop
2025-04-15 22:19:15 +03:00
206f8d9e01
#3863 Ensure cloud texture selection updates the sky
2025-04-15 21:40:17 +03:00
ae93198735
Merge branch 'main' into marchcat/maint-c-restore
...
# Conflicts:
# indra/llcommon/lldate.h
# indra/newview/llappviewer.cpp
# indra/newview/llinventorybridge.cpp
# indra/newview/llmaterialeditor.cpp
# indra/newview/llviewerparceloverlay.cpp
# indra/newview/llvoavatar.cpp
2025-04-15 19:31:20 +03:00
d19d44cc72
Merge pull request #3911 from secondlife/main
...
Merge 2025.03 release into develop.
2025-04-15 10:14:27 -04:00
5d7a5001b4
Merge commit '9e24b30' into marchcat/maint-c/restore
...
# Conflicts:
# indra/llmath/v2math.cpp
# indra/llmath/v2math.h
# indra/llmath/v3math.h
# indra/llmath/v4math.h
# indra/llui/llfolderviewitem.cpp
# indra/llui/llfolderviewitem.h
# indra/llui/llfolderviewmodel.h
# indra/llui/llmodaldialog.cpp
# indra/llui/lltexteditor.cpp
# indra/llui/lltexteditor.h
# indra/llwindow/llwindowwin32.cpp
# indra/newview/llagent.cpp
# indra/newview/llagentcamera.h
# indra/newview/llavatarrenderinfoaccountant.cpp
# indra/newview/llconversationmodel.h
# indra/newview/llfloaterinventorysettings.cpp
# indra/newview/llfloaternamedesc.cpp
# indra/newview/llfloaternamedesc.h
# indra/newview/llfloaterobjectweights.cpp
# indra/newview/llfloaterobjectweights.h
# indra/newview/llfolderviewmodelinventory.h
# indra/newview/llinspecttexture.cpp
# indra/newview/llinventorybridge.cpp
# indra/newview/llinventorybridge.h
# indra/newview/llinventoryfunctions.cpp
# indra/newview/llinventorygallery.h
# indra/newview/llinventorygallerymenu.cpp
# indra/newview/llinventorymodel.cpp
# indra/newview/llinventorypanel.cpp
# indra/newview/llinventorypanel.h
# indra/newview/llmaterialeditor.cpp
# indra/newview/lloutfitgallery.cpp
# indra/newview/lloutfitgallery.h
# indra/newview/lloutfitslist.cpp
# indra/newview/lloutfitslist.h
# indra/newview/llpanelgroupcreate.cpp
# indra/newview/llpanelgroupgeneral.cpp
# indra/newview/llpanelobjectinventory.cpp
# indra/newview/llpaneloutfitsinventory.h
# indra/newview/llpanelprofile.cpp
# indra/newview/llpanelwearing.cpp
# indra/newview/llreflectionmap.cpp
# indra/newview/llselectmgr.cpp
# indra/newview/llsidepanelappearance.cpp
# indra/newview/llsidepaneliteminfo.cpp
# indra/newview/llteleporthistorystorage.cpp
# indra/newview/lltexturectrl.cpp
# indra/newview/lltexturectrl.h
# indra/newview/lltexturefetch.cpp
# indra/newview/lltexturefetch.h
# indra/newview/llviewerassetupload.cpp
# indra/newview/llviewercamera.cpp
# indra/newview/llviewercamera.h
# indra/newview/llviewermenufile.cpp
# indra/newview/llviewerobject.h
# indra/newview/llviewertexture.cpp
# indra/newview/llviewerwindow.cpp
# indra/newview/llvoavatar.cpp
# indra/newview/llvoavatar.h
# indra/newview/llvoavatarself.cpp
# indra/newview/llvovolume.cpp
# indra/newview/llvovolume.h
# indra/newview/tests/llviewerassetstats_test.cpp
2025-04-10 06:01:50 +03:00
423df2ba4b
prevent erroneous edit of wrong parcel ( #3759 )
...
* prevent erroneous edit of wrong parcel
Fixes jira-archive-internal/issues/70771
[SL-20409] Erroneous Local Parcel Twins -
Parcel Updates Across Region Borders -
unrequested updateDatabaseParcel changes
* remove unused argument in sendParcelPropertiesUpdate()
2025-03-21 07:18:13 -07:00
c98002daa6
#3643 Use bugsplat attributes on MacOS
2025-03-04 17:23:05 +02:00
8114850e94
#3511 fix for PBR skies being too bright on Low Graphics
2025-02-18 11:33:32 +02:00
ad30637ebe
#3452 Crash in LLSaleInfo::asLLSD()
2025-01-22 18:59:38 +02:00
a27515748f
#3311 RenderSkyAutoAdjustLegacy does not engage tonemapper
2025-01-02 20:55:17 +02: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
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
cbd713037e
viewer#2889 Fix water's normal map being ignored
2024-10-31 22:58:14 +02:00
b2bb4d25cc
viewer#2889 Fixed mixed up water settings
2024-10-18 22:58:09 +03:00
3904a15c63
viewer#2705 Some sky parameters weren't updating
2024-10-02 19:26:28 +03:00
c954609958
viewer#2735 Fix day cycle not saving values
2024-09-30 22:41:40 +03:00
22675c9a05
viewer#2627 instead of checking map for being empty got empty map
2024-09-23 20:11:55 +03: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
17fed3985f
#2360 Incorrect Day Cycle name in Edit Day Cycle floater (remove unused key CANMOD)
2024-08-30 00:55:32 +02:00
40e93e9f4d
Fix formatting and add some more constexpr
2024-08-21 19:14:28 +03:00
b5e306f7d8
Enable /permissive- on MSVC for better standards conformance ( #2251 )
...
* Enable /permissive- on MSVC for better C++ conformance and fix related errors
* Clean up left over warning suppressions from old library or msvc versions
2024-08-14 08:01:02 -07:00
c106221726
Merge remote-tracking branch 'origin/release/2024.06-atlasaurus' into develop
...
# Conflicts:
# .github/workflows/build.yaml
# indra/llui/llscrolllistctrl.cpp
2024-08-09 15:43:06 -07:00
3b2c32fdf9
Merge remote-tracking branch 'origin/release/webrtc-voice' into release/2024.06-atlasaurus
...
# Conflicts:
# .github/workflows/build.yaml
# indra/newview/CMakeLists.txt
# indra/newview/llspeakers.cpp
# indra/newview/llvoicechannel.cpp
# indra/newview/llvoicechannel.h
# indra/newview/llvoiceclient.cpp
# indra/newview/llvoiceclient.h
# indra/newview/llvoicewebrtc.cpp
2024-08-09 15:10:13 -07:00
ae7f7cd670
Replace boost::shared_ptr with std in voice classes
2024-08-07 14:19:49 +03: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
9775d7ea10
Merge remote-tracking branch 'origin/release/maint-a' into project/gltf_development
2024-06-11 17:42:17 -07:00
1ebf62e102
Clean up line endings that got mangled up during last merge
2024-06-11 15:40:09 +02:00
d9789bfaf2
Merge branch 'main' of https://github.com/secondlife/viewer into DRTVWR-600-maint-A
...
# Conflicts:
# indra/llappearance/llavatarappearance.h
# indra/llimage/llimage.cpp
# indra/llmath/llvolume.cpp
# indra/llmath/llvolume.h
# indra/llprimitive/llgltfmaterial.h
# indra/llrender/llrendertarget.cpp
# indra/llrender/llshadermgr.cpp
# indra/newview/lldynamictexture.cpp
# indra/newview/llenvironment.cpp
# indra/newview/llfetchedgltfmaterial.cpp
# indra/newview/llfloaterimagepreview.cpp
# indra/newview/llfloaterimagepreview.h
# indra/newview/llfloaterregioninfo.cpp
# indra/newview/llfloaterregioninfo.h
# indra/newview/llmaniprotate.cpp
# indra/newview/llmaniptranslate.cpp
# indra/newview/llpanelvolume.cpp
# indra/newview/llselectmgr.cpp
# indra/newview/llselectmgr.h
# indra/newview/llsurface.cpp
# indra/newview/llsurface.h
# indra/newview/llsurfacepatch.cpp
# indra/newview/lltexturectrl.cpp
# indra/newview/lltexturectrl.h
# indra/newview/lltinygltfhelper.cpp
# indra/newview/llviewertexture.cpp
# indra/newview/llviewerwindow.cpp
# indra/newview/llviewerwindow.h
# indra/newview/llvlcomposition.cpp
# indra/newview/llvlcomposition.h
# indra/newview/llvocache.cpp
# indra/newview/llvovolume.cpp
# indra/newview/pipeline.cpp
2024-06-11 13:38:43 +02:00
534605eb22
Merge branch 'main' (featurette) into inventory_favorites
2024-06-11 08:37:43 +03:00
7c42711ca3
Merge remote-tracking branch 'origin/DRTVWR-600-maint-A' into project/gltf_development
2024-06-10 16:22:12 -07:00
0dcc912cec
Merge main into inventory_favorites
...
# Conflicts:
# indra/llui/llfolderviewmodel.h
# indra/newview/llpanelwearing.cpp
# indra/newview/llwearableitemslist.cpp
2024-06-10 19:25:02 +03:00
c0fad3028f
Re-enable compiler warnings C4018, C4100, C4231 and C4506
2024-06-10 16:42:43 +02:00
33ddedd6b5
#1638 Add permissions checks to GLTF Save As and Upload buttons ( #1653 )
2024-06-07 09:51:32 -05:00
b42f9d836b
Re-enable a lot of compiler warnings for MSVC and address the C4267 "possible loss of precision" warnings
2024-06-01 15:49:26 +02:00
9f6849e081
Merge remote-tracking branch 'origin/project/gltf_development' into brad/merge-maint-a-to-dev
2024-05-23 11:35:23 -07:00
Andrey Kleshchev