8d220e4973
Merge branch 'release/2025.06' of https://github.com/secondlife/viewer
...
# Conflicts:
# indra/newview/llmeshrepository.cpp
# indra/newview/viewer_manifest.py
2025-08-25 20:42:31 +02:00
143de1ddbf
#4284 Reorder window shutdown
2025-08-19 23:16:06 +03:00
478a51f8e3
Merge branch 'release/2025.06' of https://github.com/secondlife/viewer
...
# Conflicts:
# indra/llxml/llcontrol.cpp
# indra/newview/llfloaterpreference.cpp
# indra/newview/lllogchat.cpp
# indra/newview/llreflectionmap.h
2025-08-13 20:52:47 +02:00
2308328660
#4284 Better window shutdown logging
...
To help investigate shutdown freeze
2025-08-11 22:36:22 +03:00
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
ce9d66cdd1
Merge branch develop into 2025.06
...
# Conflicts:
# indra/newview/llvoavatar.cpp
2025-08-06 16:05:19 +03:00
a4e8af0dce
Merge branch 'develop' of https://github.com/secondlife/viewer
...
# Conflicts:
# .github/pull_request_template.md
# CONTRIBUTING.md
# indra/newview/CMakeLists.txt
# indra/newview/app_settings/settings.xml
# indra/newview/llappviewer.cpp
# indra/newview/llfloaterimagepreview.cpp
# indra/newview/llfloatersettingsdebug.cpp
# indra/newview/llfloatersettingsdebug.h
# indra/newview/llstatusbar.cpp
# indra/newview/llstatusbar.h
# indra/newview/res/viewerRes.rc
# indra/newview/skins/default/xui/de/panel_login_first.xml
# indra/newview/skins/default/xui/en/notifications.xml
# indra/newview/skins/default/xui/en/panel_login_first.xml
# indra/newview/skins/default/xui/en/panel_preferences_advanced.xml
# indra/newview/skins/default/xui/en/panel_preferences_privacy.xml
# indra/newview/skins/default/xui/en/panel_status_bar.xml
# indra/newview/skins/default/xui/es/panel_login_first.xml
# indra/newview/skins/default/xui/fr/panel_login_first.xml
# indra/newview/skins/default/xui/it/panel_login_first.xml
# indra/newview/skins/default/xui/ja/panel_login_first.xml
# indra/newview/skins/default/xui/pl/panel_login_first.xml
# indra/newview/skins/default/xui/pt/panel_login_first.xml
# indra/newview/skins/default/xui/ru/panel_login_first.xml
# indra/newview/skins/default/xui/tr/panel_login_first.xml
# indra/newview/skins/default/xui/zh/panel_login_first.xml
# indra/newview/viewer_manifest.py
2025-07-30 10:52:39 +02:00
5291fc252a
#4374 update icon for title bar
2025-07-26 01:20:22 +03:00
9df3b30479
#4424 don't try to update theme too early
2025-07-24 00:44:16 +03:00
0c89d06ec2
#4374 add support for the system theme (light and dark)
2025-07-23 12:11:14 +03:00
159c05a5ac
Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm-ll-master
...
# Conflicts:
# .github/workflows/qatest.yaml
# indra/newview/skins/default/xui/ja/strings.xml
2025-05-30 13:26:29 +02:00
7b770b1786
Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm-ll-master
...
# Conflicts:
# .github/workflows/qatest.yaml
# indra/llcommon/llsdutil.h
# indra/newview/llinventorybridge.cpp
# indra/newview/lloutfitgallery.cpp
# indra/newview/lloutfitgallery.h
# indra/newview/skins/default/xui/ja/strings.xml
2025-05-29 12:34:42 +02: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
355a80ab91
Merge branch 'develop' of https://github.com/secondlife/viewer
...
# Conflicts:
# indra/llimagej2coj/llimagej2coj.cpp
# indra/newview/llfloaterworldmap.cpp
# indra/newview/llfloaterworldmap.h
# indra/newview/llviewertexturelist.cpp
# indra/newview/skins/default/xui/en/floater_world_map.xml
2025-05-23 13:13:24 +02:00
6e6e105f01
#3317 Fix full screen issue with Windows 11 24H2
2025-05-05 18:30:33 +03:00
120f85c9e0
Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm-develop
...
# Conflicts:
# indra/newview/app_settings/settings.xml
# indra/newview/llvieweraudio.cpp
# indra/newview/llvoavatar.h
2025-04-25 22:20:59 +02:00
9a333e65c4
Merge develop into release/2025.04
2025-04-18 21:36:56 +03:00
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
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
cfad42bea9
Refactor LLWindowWin32::LLWindowWin32Thread::wakeAndDestroy()
...
Key improvements:
1. Better error handling for thread detachment
2. More careful sequencing of operations
3. Ensuring the window is hidden before proceeding with other shutdown steps
4. Proper checking of thread joinability before detaching
2025-04-12 06:20:38 +03:00
bab3bc4ebd
Fix more merge issues:
...
* Re-apply changes from a620e58dac826236f1bc
2025-04-11 00:07:38 +03:00
19347f7094
Fix merge issues:
...
* Restore changes from 21947778ba37586189491eeecfa1a8b9633c17e3f660f1f0fdb9633c17e398f7d73d4623729442aa
2025-04-10 23:51:36 +03:00
28f45962fd
Post-merge cleanup: llwindowwin32.cpp
2025-04-10 23:14:53 +03:00
6487febff0
Merge branch 'release/2025.04' of https://github.com/secondlife/viewer
...
# Conflicts:
# indra/llrender/llgl.cpp
# indra/llwindow/lldxhardware.cpp
# indra/llwindow/lldxhardware.h
# indra/newview/llappviewerwin32.cpp
# indra/newview/llviewerdisplay.cpp
2025-04-10 18:50:12 +02:00
3f1373de4c
Merge branch 'release/2025.03' of https://github.com/secondlife/viewer
...
# Conflicts:
# indra/llkdu/llimagej2ckdu.cpp
# indra/llwindow/llwindowwin32.cpp
# indra/newview/lleventpoll.cpp
# indra/newview/llvoavatar.h
# indra/newview/llvoavatarself.h
2025-04-10 18:28:30 +02: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
632a8648ca
#3892 Crash at fillCompositionLogfont
2025-04-08 23:38:30 +03:00
0c056c77f4
#3575 Adjust VRAM budget test a bit
2025-04-05 09:28:26 +03:00
6ec93ef403
Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm
2025-03-05 10:12:24 +01:00
4aff595bdf
Added FS comments
2025-02-21 22:50:33 +01:00
f5fdf502fa
[FIRE-10419] Selectively process devices based on CLSID to prevent stuttering #82
2025-02-18 21:06:12 +01:00
5bf1f485f3
Merge branch 'release/2024.12-ForeverFPS' of https://github.com/secondlife/viewer
...
# Conflicts:
# indra/llcommon/llqueuedthread.cpp
2025-02-13 21:24:29 +01:00
bc84cb02a2
#3332 Issues with text buffer updates
2025-02-10 23:18:33 +02:00
8758495d11
Merge branch 'release/2024.12-ForeverFPS' of https://github.com/secondlife/viewer
...
# Conflicts:
# indra/llcommon/llerror.cpp
# indra/llmath/v4math.h
# indra/llui/lltransutil.cpp
# indra/newview/llface.cpp
# indra/newview/llstartup.cpp
# indra/newview/llvovolume.cpp
2025-01-26 00:07:35 +01:00
de1ff0bd10
viewer#3088 Add graphical init and reinit
2025-01-22 16:06:30 +02:00
ad283258e0
Merge branch 'release/2024.12-ForeverFPS' of https://github.com/secondlife/viewer
...
# Conflicts:
# indra/newview/llprogressview.cpp
# indra/newview/llviewermenu.cpp
# indra/newview/skins/default/xui/de/panel_progress.xml
# indra/newview/skins/default/xui/en/panel_progress.xml
# indra/newview/skins/default/xui/fr/panel_progress.xml
# indra/newview/skins/default/xui/pl/panel_progress.xml
2025-01-15 11:19:52 +01:00
eb48eead2b
#3364 Cap intel adapters' vram to 25% of ram
2025-01-11 00:20:15 +02:00
57338733d0
Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm
2024-12-04 15:15:01 +01:00
089259b969
FIRE-34906 - (BugSplat) avoid long time crash in message handling
2024-12-01 22:46:01 +00:00
193fb1627f
Merge branch 'develop' of https://github.com/secondlife/viewer
...
# Conflicts:
# indra/newview/llappviewer.cpp
# indra/newview/llviewerdisplay.cpp
# indra/newview/llviewermedia.cpp
2024-09-19 23:04:19 +02:00
ecfd66fb09
Avoid LL_ERRS when wgl_ARB_pixel_format is not supported ( #2606 )
...
secondlife/viewer#2599
2024-09-18 18:17:02 -07:00
43ad85f315
Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm-deltafps
2024-09-09 19:51:36 +02:00
de625e97bd
Merge branch 'release/2024.08-DeltaFPS' of https://github.com/secondlife/viewer
2024-09-09 19:50:16 +02:00
82e8fd1671
Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm
...
# Conflicts:
# indra/llrender/llgl.cpp
# indra/newview/app_settings/settings.xml
# indra/newview/skins/default/xui/en/notifications.xml
2024-09-09 19:50:00 +02:00
33116ea35e
Merge pull request #2530 from secondlife/release/2024.08-DeltaFPS
...
Release/2024.08 delta fps
2024-09-09 10:28:57 -07:00
68c17705a7
Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm
...
# Conflicts:
# indra/newview/app_settings/settings.xml
# indra/newview/skins/default/xui/en/notifications.xml
2024-09-05 21:10:32 +02:00
1f477be2ce
In or out? Just throw it out! :)
2024-09-05 21:08:09 +02:00
a861e86398
#2482 Fix for Quadro GPUs claiming to have infinite VRAM ( #2511 )
2024-09-05 10:08:47 -07:00
a9b52b1f73
Merge branch 'develop' of https://github.com/secondlife/viewer
...
# Conflicts:
# indra/llrender/llfontgl.cpp
# indra/llrender/llrender.cpp
# indra/llui/llbutton.h
# indra/llui/llscrolllistctrl.cpp
# indra/llui/llscrolllistctrl.h
# indra/newview/llhudtext.h
# indra/newview/llinventorymodelbackgroundfetch.cpp
# indra/newview/llviewermenu.cpp
# indra/newview/skins/default/xui/en/menu_viewer.xml
2024-09-04 11:17:13 +02:00
Ansariel