Ansariel
afd1290c54
Merge branch 'release/2026.02' of https://github.com/secondlife/viewer
...
# Conflicts:
# indra/newview/llviewerparceloverlay.cpp
# indra/newview/skins/default/xui/da/panel_preferences_alerts.xml
# indra/newview/skins/default/xui/da/panel_preferences_sound.xml
# indra/newview/skins/default/xui/en/floater_adjust_environment.xml
# indra/newview/skins/default/xui/en/floater_inventory_settings.xml
# indra/newview/skins/default/xui/en/floater_model_preview.xml
# indra/newview/skins/default/xui/en/floater_test_textbox.xml
# indra/newview/skins/default/xui/en/panel_group_general.xml
# indra/newview/skins/default/xui/en/panel_main_inventory.xml
# indra/newview/skins/default/xui/en/panel_preferences_advanced.xml
# indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml
# indra/newview/skins/default/xui/en/panel_preferences_sound.xml
# indra/newview/skins/default/xui/en/panel_settings_sky_atmos.xml
# indra/newview/skins/default/xui/en/widgets/wearable_outfit_list_item.xml
2026-04-23 11:44:26 +02:00
Andrey Kleshchev
7d338433d4
Revert #2674 property lines optimizations
...
QA found no difference performance wise, I see a decrease in performance.
2026-04-23 02:43:21 +03:00
Ansariel
54b7bd3685
Merge branch 'develop' of https://github.com/secondlife/viewer
...
# Conflicts:
# indra/cmake/Boost.cmake
# indra/llxml/llcontrol.cpp
# indra/newview/llcallingcard.cpp
# indra/newview/lleventpoll.cpp
# indra/newview/llviewermessage.cpp
# indra/newview/skins/default/xui/en/notifications.xml
# indra/newview/skins/default/xui/en/strings.xml
# indra/newview/viewer_manifest.py
2026-01-19 10:50:32 +01:00
TJ
58ed702a77
Fix hollowed prims not shading correctly and appearing not smooth ( #3013 , #5293 )
2026-01-19 03:16:58 +02:00
Andrey Kleshchev
d541eb9c30
#5249 Crash at LLVolumeFace::remap()
...
Crash happens inside generateRemapMultiwith, no clear cause. Ideally we need the crashing model, but untill that, zero-initing remap. meshopt wants zero initialized paddings and since we are providing more space than nessesary, that might count as padding.
2026-01-10 00:08:12 +02:00
Andrey Kleshchev
676cb60ee2
#5238 Minor adjustments for LLVolumeFace crash handling
2026-01-09 05:28:18 +02:00
Ansariel
1dc82e5ed6
Merge branch 'develop' of https://github.com/secondlife/viewer
...
# Conflicts:
# indra/llcommon/llpointer.h
# indra/newview/llagentcamera.cpp
# indra/newview/llfloaterpay.cpp
# indra/newview/llfloaterregioninfo.cpp
# indra/newview/lllocalbitmaps.cpp
# indra/newview/llviewerobject.cpp
# indra/newview/llviewerobject.h
# indra/newview/llviewerparceloverlay.cpp
# indra/newview/llworldmapview.cpp
# indra/newview/skins/default/xui/en/floater_world_map.xml
# indra/newview/skins/default/xui/en/panel_region_general.xml
2026-01-06 14:32:11 +01:00
Alexander Gavriliuk
852e31b6ff
secondlife/viewer#2674 Optimize LLWorld::renderPropertyLines() - use vertexBatchPreTransformed()
2026-01-05 20:39:43 +02:00
Nat Goodspeed
9d684bc924
Migrate ~LLPointer()'s peculiar warning case to llpointer.cpp.
...
This allows removing #include "llerror.h" from llpointer.h.
Also remove #include "llmutex.h" as a heavy way to get
<boost/functional/hash.hpp>.
That requires adding #include "llmutex.h" to llimage.h, llnotifications.h,
llwatchdog.cpp and llvolumemgr.cpp, which were inheriting it from llpointer.h.
2026-01-05 19:34:44 +02:00
Ansariel
b97149cb68
Merge branch 'develop' of https://github.com/secondlife/viewer
...
# Conflicts:
# indra/llcommon/llapr.h
# indra/llmessage/llblowfishcipher.cpp
2025-12-01 10:22:56 +01:00
Rye
afb1f4d692
Replace boost noncopyable and undefined function usage with modern c++ deleted operator and constructor
2025-11-30 19:22:22 +02:00
Ansariel
e7b3d68cab
Merge branch 'develop' of https://github.com/secondlife/viewer
...
# Conflicts:
# autobuild.xml
# indra/cmake/LLPhysicsExtensions.cmake
# indra/llprimitive/CMakeLists.txt
# indra/newview/CMakeLists.txt
# indra/newview/lltexturectrl.cpp
# indra/newview/llviewerobject.cpp
# indra/newview/llviewertexture.cpp
# indra/newview/llviewerwindow.cpp
# indra/newview/llvovolume.cpp
# indra/newview/skins/default/xui/en/floater_marketplace.xml
# indra/newview/skins/default/xui/en/floater_model_preview.xml
# indra/newview/skins/default/xui/en/floater_search.xml
2025-10-11 18:51:03 +02:00
Andrey Kleshchev
694bf1e25a
#4762 Better cacheOptimize's issue handling
2025-09-30 22:45:45 +03:00
Ansariel
a41bf0f717
Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm
2025-09-30 17:27:19 +02:00
Ansariel
3665dc24f4
Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm into texture-changes-reverted
2025-09-30 16:38:47 +02:00
Ansariel
efe97b9940
Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm
...
# Conflicts:
# indra/cmake/00-Common.cmake
# scripts/packages-formatter.py
2025-09-09 19:52:09 +02:00
Beq
9bde3ecb89
More set but unused fun
2025-09-09 09:26:37 +01:00
Ansariel
b99cf9fb86
Merge branch 'project/mac_universal' of https://github.com/secondlife/viewer
...
# Conflicts:
# autobuild.xml
# indra/cmake/00-Common.cmake
# indra/cmake/APR.cmake
# indra/cmake/Audio.cmake
# indra/cmake/Boost.cmake
# indra/cmake/Copy3rdPartyLibs.cmake
# indra/cmake/LLKDU.cmake
# indra/cmake/LLPrimitive.cmake
# indra/cmake/Meshoptimizer.cmake
# indra/cmake/NGHTTP2.cmake
# indra/cmake/OPENAL.cmake
# indra/llaudio/llvorbisencode.cpp
# indra/llcommon/linden_common.h
# indra/llcommon/llcommon.cpp
# indra/llcommon/llfasttimer.cpp
# indra/llcommon/llfasttimer.h
# indra/llcommon/llfile.cpp
# indra/llcommon/llmemory.h
# indra/llcommon/llprofiler.h
# indra/llcommon/llthreadsafequeue.h
# indra/llfilesystem/lldir_win32.cpp
# indra/llkdu/llimagej2ckdu.cpp
# indra/llkdu/llimagej2ckdu.h
# indra/llkdu/llkdumem.h
# indra/llplugin/slplugin/CMakeLists.txt
# indra/llrender/llfontfreetype.cpp
# indra/llrender/llfontfreetype.h
# indra/llwindow/CMakeLists.txt
# indra/llwindow/llopenglview-objc.mm
# indra/llwindow/llwindowmacosx-objc.h
# indra/llwindow/llwindowwin32.cpp
# indra/media_plugins/cef/CMakeLists.txt
# indra/newview/CMakeLists.txt
# indra/newview/llappviewer.cpp
# indra/newview/llface.cpp
# indra/newview/pipeline.cpp
# indra/newview/viewer_manifest.py
2025-09-05 14:55:37 +02:00
Ansariel
8383b89390
Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm into texture-changes-reverted
...
# Conflicts:
# indra/newview/llviewerobject.cpp
2025-08-31 12:18:41 +02:00
Rye
ba30737d8f
Merge branch 'develop' of github.com:secondlife/viewer into rye/infinitemac
2025-08-20 18:04:55 -04:00
Ansariel
f530540d00
Reverting changes to texture pipeline back to stock LL
2025-08-17 17:26:08 +02:00
Ansariel
539959a7f8
Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm-develop
...
# Conflicts:
# .github/workflows/qatest.yaml
# indra/newview/llfloatermodelpreview.cpp
# indra/newview/llvoavatar.cpp
# indra/newview/llwearableitemslist.cpp
2025-08-06 18:47:44 +02:00
Andrey Kleshchev
ce9d66cdd1
Merge branch develop into 2025.06
...
# Conflicts:
# indra/newview/llvoavatar.cpp
2025-08-06 16:05:19 +03:00
Ansariel
a03f358910
Merge branch 'release/2025.06' of https://github.com/secondlife/viewer
...
# Conflicts:
# indra/newview/llfloaterchatmentionpicker.cpp
2025-07-09 22:48:48 +02:00
Andrey Kleshchev
9235312990
#4298 Crash at generateVertexRemapMulti
2025-06-27 20:59:31 +03:00
Ansariel
1513d97e55
Merge branch 'release/2025.05' of https://github.com/secondlife/viewer
...
# Conflicts:
# .github/workflows/qatest.yaml
# indra/newview/lltexturectrl.cpp
# indra/newview/llviewerinventory.cpp
# indra/newview/llviewerobject.cpp
# indra/newview/skins/default/xui/en/floater_inventory_settings.xml
2025-05-23 12:44:50 +02:00
Ansariel
6cb5a7425f
Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm
...
# Conflicts:
# indra/newview/llskinningutil.cpp
# indra/newview/llvoavatar.cpp
# indra/newview/skins/default/xui/ja/strings.xml
2025-05-23 12:22:21 +02:00
Ansariel
fef4f9a07e
Merge branch 'develop' of https://github.com/secondlife/viewer
...
# Conflicts:
# indra/llappearance/llavatarappearance.h
# indra/llcharacter/llcharacter.cpp
# indra/llcharacter/llcharacter.h
# indra/llcharacter/lljoint.cpp
# indra/llcharacter/lljoint.h
# indra/llimage/llimagedimensionsinfo.cpp
# indra/llprimitive/lldaeloader.h
# indra/newview/llappviewer.cpp
# indra/newview/llappviewer.h
# indra/newview/llmodelpreview.cpp
# indra/newview/llpanelface.cpp
# indra/newview/llpanelmaininventory.cpp
# indra/newview/llpanelprofilepicks.cpp
# indra/newview/llpanelprofilepicks.h
# indra/newview/llviewerdisplay.cpp
# indra/newview/llviewerparceloverlay.cpp
# indra/newview/llvoavatar.cpp
# indra/newview/llvoavatar.h
# indra/newview/llvoavatarself.cpp
# indra/newview/llvoavatarself.h
# indra/newview/llwatchdog.cpp
# indra/newview/llwatchdog.h
2025-05-03 15:45:54 +02:00
Ansariel
f0da8bdcbd
Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm
...
# Conflicts:
# indra/newview/skins/default/xui/ja/strings.xml
2025-05-03 14:07:06 +02:00
minerjr
d362e4ed8f
Cleaned up comments (incorrect comment from JIRA title)
2025-04-22 16:54:35 -03:00
Ansariel
9d3fede2c5
Use standard library functions for llisnan and replace obvious NaN checks that don't work using /fp:fast floating point behavior under MSVC
2025-04-19 14:46:23 +02:00
Ansariel Hiller
ea96f7ac5e
More constexpr improvements and cleanup of includes of a deleted header file
2025-04-18 23:23:10 +03:00
Ansariel Hiller
74a71e30e7
Restore llmath fixes that got lost during merge ( #3948 )
2025-04-18 23:15:47 +03:00
Ansariel
86f0483152
Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm-develop
...
# Conflicts:
# indra/llmath/v2math.cpp
# indra/llmath/v2math.h
# indra/llmath/v3math.h
# indra/llmath/v4math.h
2025-04-18 20:24:19 +02:00
Ansariel
4e0ad8a758
Merge branch 'develop' of https://github.com/secondlife/viewer
...
# Conflicts:
# indra/doxygen/CMakeLists.txt
# indra/llcommon/indra_constants.h
# indra/llmath/llmath.h
# indra/llmath/llvolume.cpp
# indra/llmath/v3dmath.h
# indra/llmath/v4color.h
# indra/llui/llchatentry.cpp
# indra/llui/llchatentry.h
# indra/llui/llfloater.h
# indra/llui/llkeywords.h
# indra/newview/llpanelprimmediacontrols.cpp
# indra/newview/llpanelsnapshotinventory.cpp
# indra/newview/llpanelsnapshotlocal.cpp
# indra/newview/llpanelsnapshotoptions.cpp
# indra/newview/llpanelsnapshotpostcard.cpp
# indra/newview/llpreviewscript.h
# indra/newview/pipeline.cpp
# indra/newview/skins/default/xui/de/panel_snapshot_inventory.xml
# indra/newview/skins/default/xui/de/panel_snapshot_options.xml
# indra/newview/skins/default/xui/en/panel_snapshot_inventory.xml
# indra/newview/skins/default/xui/es/panel_snapshot_options.xml
# indra/newview/skins/default/xui/fr/panel_snapshot_inventory.xml
# indra/newview/skins/default/xui/fr/panel_snapshot_options.xml
# indra/newview/skins/default/xui/it/panel_snapshot_inventory.xml
# indra/newview/skins/default/xui/it/panel_snapshot_options.xml
# indra/newview/skins/default/xui/ja/panel_snapshot_inventory.xml
# indra/newview/skins/default/xui/ja/panel_snapshot_options.xml
# indra/newview/skins/default/xui/pl/panel_snapshot_options.xml
# indra/newview/skins/default/xui/ru/panel_snapshot_options.xml
# indra/newview/skins/default/xui/zh/panel_snapshot_inventory.xml
# indra/newview/skins/default/xui/zh/panel_snapshot_options.xml
2025-04-18 19:56:20 +02:00
Andrey Lihatskiy
933f5226fe
Merge branch 'develop' into marchcat/05-develop
2025-04-18 18:11:44 +03:00
Andrey Lihatskiy
f029903cd9
Fix '1:angle_between' test failure
2025-04-18 11:57:55 +03:00
Andrey Lihatskiy
082c9158b2
Merge branch 'develop' into marchcat/05-develop
...
# Conflicts:
# indra/llmath/v2math.cpp
# indra/llmath/v2math.h
# indra/llmath/v3math.h
# indra/llmath/v4math.h
2025-04-17 23:57:00 +03:00
Ansariel
4c6afbbb75
Restore llmath improvements from archived develop branch:
...
* Make eligible functions constexpr
* Use constants for vector indices where applicable
* Reformat to match actual coding conventions
2025-04-17 19:50:30 +02:00
Ansariel
441c844ec8
Fix lerp issues on newer GCC versions
2025-04-17 18:55:08 +02:00
Ansariel
d65de99052
Use standard library functions for llisnan and replace obvious NaN checks that don't work using /fp:fast floating point behavior under MSVC
2025-04-17 18:44:09 +02:00
Ansariel
4c355879cc
Merge branch 'release/2025.05' of https://github.com/secondlife/viewer
...
# Conflicts:
# autobuild.xml
# indra/llui/llfolderviewitem.h
# indra/llui/lltexteditor.cpp
# indra/llui/lltexteditor.h
# indra/newview/app_settings/settings.xml
# indra/newview/llagent.cpp
# indra/newview/llappviewer.cpp
# indra/newview/llfloatermodelpreview.h
# indra/newview/llinventorybridge.cpp
# indra/newview/llinventorybridge.h
# indra/newview/llinventoryfilter.cpp
# indra/newview/llinventoryfilter.h
# indra/newview/llmaterialeditor.cpp
# indra/newview/lloutfitslist.cpp
# indra/newview/lloutfitslist.h
# indra/newview/llpanelmaininventory.cpp
# indra/newview/llpaneloutfitedit.cpp
# indra/newview/llpaneloutfitsinventory.cpp
# indra/newview/llpaneloutfitsinventory.h
# indra/newview/llpanelpermissions.cpp
# indra/newview/llpanelpermissions.h
# indra/newview/llpanelwearing.cpp
# indra/newview/llpanelwearing.h
# indra/newview/llselectmgr.h
# indra/newview/llskinningutil.cpp
# indra/newview/lltexturectrl.cpp
# indra/newview/lltexturefetch.cpp
# indra/newview/lltooldraganddrop.cpp
# indra/newview/llviewerattachmenu.cpp
# indra/newview/llviewerinventory.cpp
# indra/newview/llviewerinventory.h
# indra/newview/llviewerwindow.cpp
# indra/newview/llvoavatar.cpp
# indra/newview/llwearableitemslist.cpp
# indra/newview/skins/default/textures/textures.xml
# indra/newview/skins/default/xui/en/floater_inventory_item_properties.xml
# indra/newview/skins/default/xui/en/floater_object_weights.xml
# indra/newview/skins/default/xui/en/menu_gallery_outfit_tab.xml
# indra/newview/skins/default/xui/en/menu_inventory.xml
# indra/newview/skins/default/xui/en/menu_outfit_tab.xml
# indra/newview/skins/default/xui/en/menu_wearing_tab.xml
# indra/newview/skins/default/xui/en/notifications.xml
# indra/newview/skins/default/xui/en/panel_main_inventory.xml
# indra/newview/skins/default/xui/en/panel_outfit_gallery.xml
# indra/newview/skins/default/xui/en/panel_outfits_list.xml
# indra/newview/skins/default/xui/en/panel_outfits_wearing.xml
# indra/newview/skins/default/xui/en/panel_places.xml
# indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml
# indra/newview/skins/default/xui/en/panel_settings_sky_sunmoon.xml
# indra/newview/skins/default/xui/en/sidepanel_appearance.xml
# indra/newview/skins/default/xui/en/strings.xml
# indra/newview/skins/default/xui/ja/panel_settings_sky_sunmoon.xml
# indra/newview/skins/default/xui/pl/panel_settings_sky_sunmoon.xml
2025-04-16 17:49:47 +02:00
Jonathan "Geenz" Goodman
52cca995cc
Merge branch 'release/2025.04' into rye/forevermac
2025-04-15 13:55:01 -04:00
Andrey Lihatskiy
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
Ansariel
19347f7094
Fix merge issues:
...
* Restore changes from 21947778ba37586189491eeecfa1a8b9633c17e3f660f1f0fdb9633c17e398f7d73d4623729442aa
2025-04-10 23:51:36 +03:00
Andrey Lihatskiy
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
Ansariel
1243de5d84
Merge branch 'release/2025.03' of https://github.com/secondlife/viewer
2025-04-03 23:08:03 +02:00
Andrey Kleshchev
4ddd9d1fef
#3814 More bad_alloc handling
...
warn user and error
2025-03-31 22:43:04 +03:00
Ansariel
b140406910
Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm
2025-03-23 11:46:47 +01:00
Jonathan "Geenz" Goodman
97085ed300
Merge branch 'release/2025.03' into rye/forevermac
2025-03-13 05:28:36 -04:00
Ansariel