Ansariel
|
440c7f214e
|
Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm
|
2025-08-13 20:31:56 +02:00 |
|
Beq
|
66b3635868
|
Merge remote-tracking branch 'origin/bugfix/FIRE-34084'
|
2025-08-10 14:08:30 +01:00 |
|
Ansariel
|
0871a8ed4a
|
Merge branch 'release/2025.06' of https://github.com/secondlife/viewer
# Conflicts:
# indra/llui/llurlentry.cpp
# indra/newview/llfloatermodelpreview.cpp
# indra/newview/llvoavatar.cpp
|
2025-08-06 19:07:19 +02:00 |
|
Andrey Kleshchev
|
3806c35ebe
|
#4216 Pressing cancel on picker reverts an override
even when it shouldn't revert material override
|
2025-07-18 15:17:21 +03:00 |
|
Ansariel
|
7d03d5af2a
|
Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm
|
2025-07-09 22:50:15 +02:00 |
|
Kitty Barnett
|
6368d112c9
|
FIRE-34084: Restore minimal set of appearance fixes
|
2025-06-12 20:39:58 +02:00 |
|
Ansariel
|
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 |
|
Kitty Barnett
|
d44b21065d
|
[FIXED] FIRE-34232: 'Detach' on the wearing context menu for temporary attachments bypasses attachment locks
|
2025-06-01 01:20:46 +02:00 |
|
Ansariel
|
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 |
|
Andrey Lihatskiy
|
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 |
|
Ansariel
|
524cb336dc
|
Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm
|
2025-05-28 19:39:10 +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 |
|
Beq
|
802f121822
|
Cleanup comment noise
|
2025-05-23 11:04:41 +01:00 |
|
Ansariel
|
0360d8529a
|
Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm
# Conflicts:
# indra/newview/llmeshrepository.cpp
# indra/newview/llviewerregion.cpp
# indra/newview/llviewerregion.h
|
2025-05-23 12:00:16 +02:00 |
|
Hecklezz
|
b1b0a017de
|
Fix FSSelectCopyableOnly and FSSelectLockedOnly so you can still click the object outside of build/edit mode
|
2025-05-18 23:08:07 +10:00 |
|
Ansariel
|
9df4d7ba96
|
Merge branch 'release/2025.04' of https://github.com/secondlife/viewer
# Conflicts:
# indra/cmake/Python.cmake
# indra/newview/llimview.cpp
# indra/newview/llpanelface.cpp
# indra/newview/skins/default/colors.xml
|
2025-05-08 14:49:31 +02:00 |
|
Andrey Kleshchev
|
fe0a4f44cf
|
#4027 Crash at adjustTexturesByScale
|
2025-05-05 21:11:48 +03:00 |
|
Ansariel
|
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 |
|
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 |
|
Hecklezz
|
3f6102bc06
|
Hide and restore GLTF material depending if on the BP or PBR tab to fix visual issues.
|
2025-04-18 20:25:25 +10: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 |
|
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
|
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 |
|
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 |
|
Andrey Kleshchev
|
b62aae7959
|
#3849 Crash at LLSelectMgr::updatePointAt
|
2025-04-07 21:13:48 +03:00 |
|
Ansariel
|
beb3ff3d36
|
Merge branch 'release/2025.04' of https://github.com/secondlife/viewer
# Conflicts:
# indra/newview/llagentlistener.cpp
# indra/newview/llappearancemgr.cpp
# indra/newview/llviewerparcelmgr.cpp
# indra/newview/llvoavatar.cpp
# indra/newview/llvoavatar.h
# indra/newview/llvoavatarself.h
|
2025-04-04 12:46:39 +02:00 |
|
Ansariel
|
6c214f773f
|
Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm-202503
|
2025-04-04 00:42:49 +02:00 |
|
Andrey Kleshchev
|
939817d560
|
#3849 Crash at LLSelectMgr::updatePointAt
|
2025-04-01 22:13:54 +03:00 |
|
Jonathan "Geenz" Goodman
|
ccdcbfeebd
|
Merge branch 'release/2025.03' into release/2025.04
|
2025-04-01 13:10:33 -04:00 |
|
Ansariel
|
82b05f1063
|
Merge branch 'release/2025.04' of https://github.com/secondlife/viewer
# Conflicts:
# indra/llui/llfloater.h
# indra/newview/llfloatersnapshot.h
# indra/newview/llstatusbar.cpp
# indra/newview/llviewerwindow.cpp
# indra/newview/skins/default/xui/da/floater_about.xml
# indra/newview/skins/default/xui/de/panel_snapshot_inventory.xml
# indra/newview/skins/default/xui/de/strings.xml
# indra/newview/skins/default/xui/en/floater_snapshot.xml
# indra/newview/skins/default/xui/en/panel_snapshot_inventory.xml
# indra/newview/skins/default/xui/en/panel_tools_texture.xml
# indra/newview/skins/default/xui/es/strings.xml
# indra/newview/skins/default/xui/fr/panel_snapshot_inventory.xml
# indra/newview/skins/default/xui/fr/strings.xml
# indra/newview/skins/default/xui/it/panel_snapshot_inventory.xml
# indra/newview/skins/default/xui/it/strings.xml
# indra/newview/skins/default/xui/ja/panel_settings_water.xml
# indra/newview/skins/default/xui/ja/panel_snapshot_inventory.xml
# indra/newview/skins/default/xui/ja/strings.xml
# indra/newview/skins/default/xui/pt/strings.xml
# indra/newview/skins/default/xui/ru/strings.xml
# indra/newview/skins/default/xui/zh/panel_snapshot_inventory.xml
# indra/newview/skins/default/xui/zh/strings.xml
# scripts/messages/message_template.msg
# scripts/messages/message_template.msg.sha1
|
2025-03-31 23:55:28 +02:00 |
|
Ansariel
|
99e1699479
|
Merge branch 'release/2025.03' of https://github.com/secondlife/viewer
# Conflicts:
# indra/llappearance/llwearable.cpp
# indra/newview/llappviewer.cpp
# indra/newview/llappviewerwin32.cpp
# indra/newview/llviewerassetstorage.cpp
# indra/newview/llviewertexturelist.cpp
# indra/newview/llviewerwindow.cpp
|
2025-03-27 19:36:45 +01:00 |
|
Maxim Nikolenko
|
6b88a2bec2
|
#3780 disable water exclusion if user applies PBR or Media
|
2025-03-24 18:05:06 +02:00 |
|
Andrey Kleshchev
|
bf0767b0d7
|
viewer#2894 Make PBR scale like Blinn Phong does
|
2025-03-19 21:55:01 +02:00 |
|
Ansariel
|
6a10f6f20a
|
Merge branch 'release/2025.03' of https://github.com/secondlife/viewer
# Conflicts:
# indra/newview/llappdelegate-objc.mm
# indra/newview/llpanelface.cpp
# indra/newview/skins/default/xui/en/notifications.xml
# indra/newview/skins/default/xui/en/panel_tools_texture.xml
|
2025-03-05 10:12:03 +01:00 |
|
Maxim Nikolenko
|
6ca6bdd629
|
#3630 fix for incorrectly pointed particle beam after dropping HUD attachment
|
2025-03-04 21:32:46 +02:00 |
|
Ansariel
|
d19e6abc5e
|
Merge branch 'release/2025.03' of https://github.com/secondlife/viewer
# Conflicts:
# indra/newview/llappviewer.cpp
# indra/newview/llgiveinventory.cpp
# indra/newview/llstartup.cpp
# indra/newview/lltooldraganddrop.cpp
# indra/newview/llvoavatar.cpp
# indra/newview/skins/default/xui/fr/floater_avatar_textures.xml
# indra/newview/skins/default/xui/it/floater_avatar_textures.xml
# indra/newview/skins/default/xui/ja/floater_avatar_textures.xml
# indra/newview/skins/default/xui/pl/floater_avatar_textures.xml
# indra/newview/skins/default/xui/zh/floater_avatar_textures.xml
|
2025-03-01 01:09:19 +01:00 |
|
Andrey Kleshchev
|
4214ab8e79
|
#3280 Fix crashes at gFloaterTools
Likely specific to headless client
|
2025-02-28 00:02:02 +02:00 |
|
Ansariel
|
c53bc7e74f
|
Merge branch 'release/2024.09-ExtraFPS' of https://github.com/secondlife/viewer
# Conflicts:
# indra/newview/llviewercontrol.cpp
# indra/newview/skins/default/xui/en/notifications.xml
|
2024-12-15 21:44:14 +01:00 |
|
Brad Linden
|
5b77436cf0
|
#3288 null overrides crashes (#3289)
* Fixes for secondlife/viewer#3288 override copy related crashes when overrides can be nullptr
|
2024-12-13 16:13:30 -08:00 |
|
Ansariel
|
215c2d2de0
|
Merge branch 'release/2024.09-ExtraFPS' of https://github.com/secondlife/viewer
|
2024-12-05 23:26:47 +01:00 |
|
Andrey Kleshchev
|
27fb297b6f
|
#3190 Ensure materials are properly copied instead of reused.
|
2024-12-04 19:03:28 +02:00 |
|
Ansariel
|
ef39bd37fa
|
Merge branch 'develop' of https://github.com/secondlife/viewer
# Conflicts:
# indra/newview/llglsandbox.cpp
# indra/newview/llselectmgr.cpp
# indra/newview/llviewermenu.cpp
# indra/newview/llviewermenu.h
# indra/newview/skins/default/xui/en/panel_preferences_sound.xml
|
2024-09-11 03:02:44 +02:00 |
|
Ansariel
|
761a4fa429
|
Clean up llviewermenu
|
2024-09-10 13:54:38 +02:00 |
|
Ansariel
|
80f9aaa46e
|
Merge branch 'develop' of https://github.com/secondlife/viewer
# Conflicts:
# autobuild.xml
# indra/cmake/Audio.cmake
# indra/llui/llconsole.cpp
# indra/newview/app_settings/settings.xml
# indra/newview/llfloaterimnearbychathandler.cpp
# indra/newview/llfloaterscriptedprefs.cpp
# indra/newview/llhudnametag.cpp
# indra/newview/llhudtext.cpp
# indra/newview/llpanelpermissions.cpp
# indra/newview/llscripteditor.cpp
# indra/newview/lltexturefetch.cpp
# indra/newview/lltextureview.cpp
# indra/newview/llviewerchat.cpp
# indra/newview/llviewerchat.h
# indra/newview/llviewermenu.cpp
# indra/newview/llviewerobjectlist.cpp
# indra/newview/llviewerparceloverlay.cpp
# indra/newview/llviewerparceloverlay.h
# indra/newview/llviewerwindow.cpp
# indra/newview/llvoavatar.cpp
# indra/newview/llvosurfacepatch.cpp
|
2024-08-05 20:10:02 +02:00 |
|
Rye Mutt
|
874794ea58
|
Add LLUIColorTable debug-settings-like floater for easing skin design
|
2024-08-04 23:11:57 -04:00 |
|
Ansariel
|
cb43c1c792
|
Merge branch 'develop' of https://github.com/secondlife/viewer
# Conflicts:
# autobuild.xml
# indra/llcommon/llprofiler.h
# indra/llcommon/llthread.cpp
# indra/newview/llappviewer.cpp
# indra/newview/llfloaterpreferencesgraphicsadvanced.cpp
|
2024-07-10 12:36:15 +02:00 |
|
Andrey Kleshchev
|
21f40280ec
|
viewer#1299 PBR texture stretches when "stretch textures" is unchecked
|
2024-07-09 18:07:36 +03:00 |
|
Ansariel
|
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 |
|
Andrey Kleshchev
|
22782a0c68
|
viewer#1131 Fix gltf editor being a bit spamy
|
2024-07-08 16:19:39 +03:00 |
|
Ansariel
|
e9b6550c48
|
Merge branch 'develop' of https://github.com/secondlife/viewer
# Conflicts:
# indra/llfilesystem/llfilesystem.cpp
# indra/newview/llappviewer.cpp
# indra/newview/lltextureview.cpp
# indra/newview/llviewertexture.h
# indra/newview/llviewertexturelist.cpp
|
2024-07-06 11:06:55 +02:00 |