1912 Commits (d4e9604700a1dbae3dbce58a3be0fda1465fd39c)

Author	SHA1	Message	Date
Ansariel	22d4c8b94d	Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm	2024-04-02 19:35:40 +02:00
Beq	60c6edd3ab	Update autobuild install instructions to prefer requirements.txt	2024-03-29 23:45:56 +00:00
Pork Chop	881a5e63ac	Linux: Update documentation for compiling	2024-03-28 23:01:49 +00:00
Ansariel	77b6a6e978	Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm	2024-03-27 15:32:45 +01:00
Ansariel	07b99632f3	Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm ... # Conflicts: # indra/llcommon/llerror.cpp # indra/llimage/llimagebmp.cpp # indra/llimage/llimagetga.cpp # indra/llrender/llrender.cpp # indra/llui/lltransutil.cpp # indra/newview/app_settings/settings.xml # indra/newview/llfloaterenvironmentadjust.cpp # indra/newview/llpaneleditwater.cpp # indra/newview/llpanelface.cpp # indra/newview/lltexturectrl.cpp # indra/newview/lltexturectrl.h # indra/newview/skins/default/xui/de/menu_viewer.xml # indra/newview/skins/default/xui/de/strings.xml # indra/newview/skins/default/xui/en/strings.xml	2024-03-27 12:48:58 +01:00
Ansariel	cbf6aca2e8	Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm ... # Conflicts: # .github/workflows/build.yaml	2024-03-27 10:35:43 +01:00
Andrey Lihatskiy	990c8b81da	Merge branch 'main' into marchcat/yz-merge	2024-03-27 01:40:12 +02:00
Ansariel	9f535a0e2d	Merge branch 'release/materials_featurette' of https://github.com/secondlife/viewer	2024-03-27 00:04:15 +01:00
Andrey Lihatskiy	1ae6f5dd6f	Merge branch 'main' into DRTVWR-591-maint-X ... # Conflicts: # indra/llui/lltransutil.cpp # indra/newview/app_settings/settings.xml # indra/newview/llfloaterenvironmentadjust.cpp # indra/newview/llpaneleditwater.cpp # indra/newview/llpanelface.cpp # indra/newview/lltexturectrl.cpp # indra/newview/lltexturectrl.h	2024-03-27 00:33:40 +02:00
Andrey Lihatskiy	78174fc865	Merge remote-tracking branch 'origin/main' into DRTVWR-588-maint-W ... # Conflicts: # .github/workflows/build.yaml	2024-03-27 00:14:56 +02:00
Ansariel	c111665779	Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm	2024-03-26 22:29:40 +01:00
Cosmic Linden	2ef42c8c36	viewer#1051: Credit Ansariel for this fix	2024-03-25 15:52:30 -07:00
Ansariel	a8446ac624	Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm	2024-03-24 21:52:26 +01:00
Ansariel	4882ed24e8	Merge branch 'release/materials_featurette' of https://github.com/secondlife/viewer ... # Conflicts: # indra/newview/llvlcomposition.cpp # indra/newview/skins/default/xui/en/notifications.xml	2024-03-23 13:18:33 +01:00
Cosmic Linden	72594038c0	secondlife/viewer#1027: Update test plan	2024-03-20 17:11:20 -07:00
Cosmic Linden	e2a3edf6da	secondlife/viewer-issues#82: Update test plan	2024-03-19 16:13:04 -07:00
Cosmic Linden	3caf96b9ad	secondlife/viewer#1006: Update test plan	2024-03-18 13:26:41 -07:00
Ansariel	159ef68fa7	Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm ... # Conflicts: # indra/llrender/llfontgl.cpp # indra/llrender/llfontgl.h # indra/llui/lltextbase.cpp # indra/llui/lltexteditor.cpp # indra/newview/llavatarpropertiesprocessor.h # indra/newview/llfloateremojipicker.cpp	2024-03-17 16:41:38 +01:00
Cosmic Linden	cc6175274c	secondlife/viewer#906: Fix broken test plan link	2024-03-15 16:14:13 -07:00
Ansariel	efe7cdf153	Merge branch 'release/materials_featurette' of https://github.com/secondlife/viewer ... # Conflicts: # indra/cmake/Copy3rdPartyLibs.cmake # indra/newview/app_settings/settings.xml # indra/newview/skins/default/xui/de/panel_region_terrain.xml # indra/newview/skins/default/xui/es/panel_region_terrain.xml # indra/newview/skins/default/xui/fr/panel_region_terrain.xml # indra/newview/skins/default/xui/it/panel_region_terrain.xml # indra/newview/skins/default/xui/ja/panel_region_terrain.xml # indra/newview/skins/default/xui/pt/panel_region_terrain.xml # indra/newview/skins/default/xui/ru/panel_region_terrain.xml # indra/newview/skins/default/xui/tr/panel_region_terrain.xml # indra/newview/viewer_manifest.py	2024-03-15 22:52:24 +01:00
Cosmic Linden	72987ac256	secondlife/viewer#760: Update test plan for terrain texture max resolution validation	2024-03-15 12:48:45 -07:00
cosmic-linden	e056d4f720	Merge pull request #992 from secondlife/vi-76 ... secondlife/viewer#76: Change wording of terrain blending documentation when using materials	2024-03-13 17:07:42 -07:00
Cosmic Linden	1a539523e2	secondlife/viewer#76: Update test plan to specify that terrain composition labels should match the current context	2024-03-13 16:21:38 -07:00
RunitaiLinden	d909e72438	#975 Add RenderHDRISplitScreen debug setting (#976) ... * #975 Add RenderHDRISplitScreen debug setting * Create hdri_local_preview.md	2024-03-13 12:27:33 -05:00
RunitaiLinden	ef75523555	983 add debug setting to control the maximum download resolution (#986) ... * Create RenderMaxTextureResolution.md * #983 Add RenderMaxTextureResolution setting. Incidental crash fix.	2024-03-13 12:22:12 -05:00
Cosmic Linden	f335d9af2c	secondlife/viewer#906: Add tiling test to renamed PBR terrain appearance test plan	2024-03-13 10:18:09 -07:00
Cosmic Linden	7acfc57cbe	secondlife/viewer#906: Rename a PBR terrain test plan	2024-03-13 10:11:03 -07:00
Ansariel	2c64715842	Merge branch 'release/materials_featurette' of https://github.com/secondlife/viewer ... # Conflicts: # indra/cmake/Copy3rdPartyLibs.cmake # indra/llimage/llimagebmp.cpp # indra/llimage/llimagetga.cpp # indra/llrender/llrender.cpp # indra/llui/lltransutil.cpp # indra/newview/CMakeLists.txt # indra/newview/app_settings/settings.xml # indra/newview/llappviewer.cpp # indra/newview/llfilepicker.cpp # indra/newview/llfilepicker.h # indra/newview/llfloaterregioninfo.cpp # indra/newview/llviewerwindow.cpp # indra/newview/viewer_manifest.py	2024-03-08 20:35:53 +01:00
Ansariel	dec97544fc	Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm	2024-03-08 19:12:09 +01:00
cosmic-linden	4195e35593	Merge pull request #927 from secondlife/v-712 ... PBR Terrain UI second pass	2024-03-06 13:46:16 -08:00
Ansariel	c9f88a1ca4	Ditch some files we don't need	2024-03-05 12:05:14 +01:00
Cosmic Linden	0cf4141d7d	secondlife/viewer#712: Add/update test plans for PBR terrain composition	2024-03-04 14:44:41 -08:00
Ansariel	ac898495ae	Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm ... # Conflicts: # indra/llcommon/llstring.cpp # indra/llcommon/llstring.h	2024-03-04 22:38:34 +01:00
Andrey Lihatskiy	b68a05e7c3	Merge branch 'main' into marchcat/x-merge ... # Conflicts: # indra/llcommon/llstring.cpp # indra/llcommon/llstring.h	2024-03-04 18:01:05 +02:00
Ansariel	799c2c6dab	Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm ... # Conflicts: # indra/newview/llinventorygallery.cpp # indra/newview/skins/default/xui/de/menu_viewer.xml	2024-03-02 00:42:18 +01:00
Ansariel	d1a0841f6c	Merge branch 'master' of https://bitbucket.org/Ansariel/phoenix-firestorm-gltf-maint2	2024-03-01 23:44:04 +01:00
Ansariel	2827ebf04f	Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm	2024-03-01 22:47:21 +01:00
Ansariel	203ac04bf6	Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm ... # Conflicts: # indra/newview/skins/default/xui/en/floater_stats.xml	2024-03-01 20:49:42 +01:00
Brad Linden	8164dce567	Merge remote-tracking branch 'origin/release/gltf-maint2' into release/materials_featurette	2024-03-01 10:17:37 -08:00
Brad Linden	258c039584	Merge remote-tracking branch 'origin/main' into release/gltf-maint2	2024-03-01 10:12:00 -08:00
Andrey Lihatskiy	faf69f407f	Merge branch 'main' into marchcat/yz-merge ... # Conflicts: # indra/newview/llinventorygallery.cpp	2024-03-01 18:02:48 +02:00
Andrey Lihatskiy	6d077c90a0	Merge branch 'main' into DRTVWR-588-maint-W	2024-03-01 17:30:06 +02:00
Ansariel	eb98cb3864	Merge branch 'release/materials_featurette' of https://github.com/secondlife/viewer ... # Conflicts: # indra/newview/lltexturectrl.cpp	2024-02-22 20:17:20 +01:00
Cosmic Linden	a1aa0b7c5e	secondlife/viewer-issues#72: Test plan feedback and additional improvements	2024-02-21 17:44:01 -08:00
Cosmic Linden	ce55ff2e77	secondlife/viewer-issues#72: Add test plan	2024-02-21 15:37:06 -08:00
Ansariel	474cbf62cf	Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm	2024-02-14 18:04:46 +01:00
Ansariel	9f2be1de74	Merge branch 'release/materials_featurette' of https://github.com/secondlife/viewer ... # Conflicts: # indra/newview/app_settings/settings.xml # indra/newview/lltexturectrl.cpp # indra/newview/llviewermenu.cpp # indra/newview/llviewerregion.cpp # indra/newview/skins/default/xui/en/floater_tools.xml	2024-02-12 12:54:03 +01:00
Ansariel	bc6a69ac66	Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm	2024-02-11 18:37:21 +01:00
Cosmic Linden	0ca75120be	secondlife/viewer-issues#67: Add test plan	2024-02-08 14:41:49 -08:00
Ansariel	598dfb1f34	Pre-empt LL and add build instructions replacing the mostly outdated build readme files	2024-02-08 23:11:59 +01:00
Cosmic Linden	c74adabdb5	secondlife/viewer#711: Add test plan	2024-02-07 12:33:00 -08:00
Ansariel	80579b7574	Merge branch 'master' of https://bitbucket.org/Ansariel/phoenix-firestorm-599 ... # Conflicts: # indra/newview/llchiclet.h	2024-02-05 23:32:19 +01:00
Andrey Lihatskiy	e3e1672ac4	Merge branch 'DRTVWR-599-maint-Z' into release/maint-yz ... # Conflicts: # indra/newview/llchiclet.h	2024-02-05 22:04:40 +02:00
Ansariel	23edfd0bfa	Merge branch 'release/gltf-maint2' of https://github.com/secondlife/viewer ... # Conflicts: # indra/newview/app_settings/settings.xml	2024-01-25 20:39:44 +01:00
RunitaiLinden	79f5231db2	Create test plan for optimizeAwayAlpha (#663)	2024-01-23 15:45:33 -06:00
Ansariel	45dc1a63f0	Merge branch 'DRTVWR-599-maint-Z' of https://github.com/secondlife/viewer ... # Conflicts: # indra/llprimitive/lldaeloader.cpp # indra/llui/lllayoutstack.cpp # indra/llui/llnotifications.h # indra/llui/lltoolbar.cpp # indra/newview/CMakeLists.txt # indra/newview/llagent.cpp # indra/newview/llappviewer.cpp # indra/newview/llfloaterimcontainer.cpp # indra/newview/llfloaterimnearbychathandler.h # indra/newview/llinventoryfunctions.cpp # indra/newview/llpaneloutfitsinventory.h # indra/newview/llsidepanelappearance.h # indra/newview/lltoolbarview.cpp	2024-01-12 14:18:34 +01:00
Ansariel	709aaaf0b0	Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm-ll-master ... # Conflicts: # indra/newview/VIEWER_VERSION.txt	2024-01-09 11:58:47 +01:00
Ansariel	b9a2c8279f	Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm-ll-master ... # Conflicts: # indra/newview/VIEWER_VERSION.txt	2024-01-09 10:54:50 +01:00
Ansariel	0a292ab51d	Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm-ll-master ... # Conflicts: # indra/newview/VIEWER_VERSION.txt	2024-01-09 10:21:07 +01:00
Ansariel	3bd76c0fea	Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm-ll-master ... # Conflicts: # indra/newview/VIEWER_VERSION.txt # indra/newview/llfasttimerview.cpp # indra/newview/skins/default/xui/en/widgets/color_swatch.xml # indra/newview/skins/default/xui/en/widgets/texture_picker.xml	2024-01-09 09:37:38 +01:00
Andrey Kleshchev	e5ef481cd3	SL-20781 Follow up on boost to std replacement	2024-01-09 00:19:39 +02:00
Andrey Lihatskiy	7d4de08fa9	Merge branch 'main' into DRTVWR-489 ... # Conflicts: # indra/newview/llmaterialeditor.cpp	2024-01-08 23:49:38 +02:00
Andrey Lihatskiy	fee385247e	Merge branch 'main' into DRTVWR-594-maint-Y	2024-01-08 23:16:14 +02:00
Andrey Lihatskiy	fe796dac71	Merge branch 'main' into DRTVWR-588-maint-W	2024-01-08 23:15:00 +02:00
Ansariel	725f7b747a	Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm-ll-master	2024-01-08 20:34:32 +01:00
Andrey Kleshchev	afe91b7eb6	Merge main (DRTVWR-596 GLTF Materials Maint) into DRTVWR-591-maint-X ... # Conflicts: # indra/newview/VIEWER_VERSION.txt	2024-01-08 21:33:06 +02:00
Ansariel	c0abd01b17	Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm-ll-master	2024-01-05 13:17:48 +01:00
Ansariel	a8f43fd40b	Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm	2024-01-05 13:17:23 +01:00
Ansariel	8d59c0b1a3	Add readme file	2024-01-02 17:38:47 +01:00
Ansariel	e341621a8e	Merge branch 'DRTVWR-594-maint-Y' of https://github.com/secondlife/viewer ... # Conflicts: # autobuild.xml # indra/llcommon/llmemory.cpp # indra/llui/lltooltip.cpp # indra/newview/llagent.cpp # indra/newview/llpanelteleporthistory.cpp # indra/newview/skins/default/xui/en/menu_inventory.xml # indra/newview/skins/default/xui/en/notifications.xml	2023-12-27 13:00:20 +01:00
Ansariel	b32cd27b4c	Merge branch 'master' of https://vcs.firestormviewer.org/viewer-merges/phoenix-firestorm-ll-master ... # Conflicts: # autobuild.xml # indra/cmake/ViewerMiscLibs.cmake # indra/llmath/llvolume.cpp # indra/newview/fonts/DejaVu-license.txt # indra/newview/fonts/DejaVuSans-Bold.ttf # indra/newview/fonts/DejaVuSans-BoldOblique.ttf # indra/newview/fonts/DejaVuSans-Oblique.ttf # indra/newview/fonts/DejaVuSans.ttf # indra/newview/fonts/DejaVuSansMono.ttf # indra/newview/llviewermenu.cpp	2023-12-18 19:25:49 +01:00
Ansariel	830c9ce388	Merge branch 'master' of https://vcs.firestormviewer.org/viewer-merges/phoenix-firestorm-ll-master ... # Conflicts: # doc/contributions.txt # indra/newview/llpanelprofile.cpp	2023-12-18 19:05:55 +01:00
Andrey Lihatskiy	c87850ddab	Merge branch 'main' into DRTVWR-591-maint-X ... # Conflicts: # doc/contributions.txt # indra/newview/llpanelprofile.cpp # indra/newview/llspatialpartition.cpp	2023-12-18 07:57:29 +02:00
Andrey Lihatskiy	aed6313d7c	Merge branch 'main' into DRTVWR-594-maint-Y	2023-12-18 06:33:57 +02:00
Ansariel	6f49b2609e	Merge branch 'DRTVWR-596' of https://github.com/secondlife/viewer	2023-12-15 23:36:05 +01:00
Ansariel	783e488a63	Merge branch 'master' of https://vcs.firestormviewer.org/viewer-merges/phoenix-firestorm-ll-master ... # Conflicts: # indra/newview/llfloaterimcontainer.cpp # indra/newview/llspatialpartition.cpp	2023-12-15 22:48:56 +01:00
Andrey Lihatskiy	793bed7d06	Merge branch 'main' into DRTVWR-489 ... # Conflicts: # indra/newview/fonts/DejaVu-license.txt # indra/newview/fonts/DejaVuSans-Bold.ttf # indra/newview/fonts/DejaVuSans-BoldOblique.ttf # indra/newview/fonts/DejaVuSans-Oblique.ttf # indra/newview/fonts/DejaVuSans.ttf # indra/newview/fonts/DejaVuSansMono.ttf	2023-12-15 07:06:15 +02:00
Brad Linden	4c791e098d	Merge remote-tracking branch 'origin/main' into DRTVWR-596	2023-12-14 12:07:18 -08:00
Andrey Lihatskiy	4b98ae6e8a	Merge branch 'DRTVWR-587-maint-V' into DRTVWR-588-maint-W ... # Conflicts: # indra/newview/llspatialpartition.cpp	2023-12-14 02:47:44 +02:00
Cosmic Linden	88b228a94d	Credit Henri for HUD fix	2023-12-13 13:39:53 -08:00
Alexander Gavriliuk	c9cd5631e4	Merge branch 'main' into DRTVWR-489	2023-12-05 03:37:06 +01:00
Ansariel	c06fa64758	Merge branch 'master' of https://vcs.firestormviewer.org/viewer-merges/phoenix-firestorm-ll-master ... # Conflicts: # indra/llrender/llgl.cpp # indra/llrender/llvertexbuffer.cpp # indra/llui/llflatlistview.cpp # indra/newview/lldrawpoolground.cpp # indra/newview/llfloaterpreference.cpp # indra/newview/llinventorybridge.cpp # indra/newview/llinventorygallery.cpp # indra/newview/llspatialpartition.cpp # indra/newview/llviewercontrol.cpp # indra/newview/llviewertexture.cpp # indra/newview/llviewertexturelist.cpp # indra/newview/llvosky.cpp	2023-12-01 13:10:11 +01:00
Ansariel	d26000bac7	Merge branch 'master' of https://vcs.firestormviewer.org/viewer-merges/phoenix-firestorm-ll-master ... # Conflicts: # indra/llrender/llgl.cpp # indra/llrender/llvertexbuffer.cpp # indra/llui/llflatlistview.cpp # indra/newview/app_settings/settings.xml # indra/newview/lldrawpoolground.cpp # indra/newview/llpaneleditwearable.cpp # indra/newview/llspatialpartition.cpp # indra/newview/lltexturefetch.cpp # indra/newview/llviewertexture.cpp # indra/newview/llvosky.cpp # indra/newview/skins/default/xui/de/notifications.xml # indra/newview/skins/default/xui/en/floater_stats.xml # indra/newview/skins/default/xui/en/floater_texture_fetch_debugger.xml	2023-12-01 12:39:13 +01:00
Ansariel	50c7296d34	Merge branch 'master' of https://vcs.firestormviewer.org/viewer-merges/phoenix-firestorm-ll-master ... # Conflicts: # indra/llcommon/CMakeLists.txt # indra/newview/llspatialpartition.cpp # indra/newview/llvoavatar.cpp	2023-12-01 11:27:42 +01:00
Ansariel	f08bf0aa72	Merge branch 'DRTVWR-588-maint-W' of H:/ViewerDev/viewer-588 ... # Conflicts: # indra/newview/llspatialpartition.cpp # indra/newview/skins/default/xui/en/alert_icon.xml # indra/newview/skins/default/xui/en/floater_associate_listing.xml # indra/newview/skins/default/xui/en/floater_ban_duration.xml # indra/newview/skins/default/xui/en/floater_experiences.xml # indra/newview/skins/default/xui/en/floater_inventory_view_finder.xml # indra/newview/skins/default/xui/en/floater_live_lsleditor.xml # indra/newview/skins/default/xui/en/floater_mfa.xml # indra/newview/skins/default/xui/en/floater_mute_object.xml # indra/newview/skins/default/xui/en/floater_preferences_graphics_advanced.xml # indra/newview/skins/default/xui/en/floater_preview_animation.xml # indra/newview/skins/default/xui/en/floater_script_search.xml # indra/newview/skins/default/xui/en/floater_test_inspectors.xml # indra/newview/skins/default/xui/en/floater_test_line_editor.xml # indra/newview/skins/default/xui/en/floater_test_textbox.xml # indra/newview/skins/default/xui/en/floater_texture_fetch_debugger.xml # indra/newview/skins/default/xui/en/floater_web_content.xml # indra/newview/skins/default/xui/en/menu_profile_overflow.xml # indra/newview/skins/default/xui/en/menu_toolbars.xml # indra/newview/skins/default/xui/en/notifications.xml # indra/newview/skins/default/xui/en/panel_blocked_list_item.xml # indra/newview/skins/default/xui/en/panel_bottomtray_lite.xml # indra/newview/skins/default/xui/en/panel_edit_universal.xml # indra/newview/skins/default/xui/en/panel_group_creation_sidetray.xml # indra/newview/skins/default/xui/en/panel_navigation_bar.xml # indra/newview/skins/default/xui/en/panel_performance_complexity.xml # indra/newview/skins/default/xui/en/panel_performance_huds.xml # indra/newview/skins/default/xui/en/panel_performance_preferences.xml # indra/newview/skins/default/xui/en/panel_preferences_advanced.xml # indra/newview/skins/default/xui/en/panel_preferences_sound.xml # indra/newview/skins/default/xui/en/panel_stand_stop_flying.xml # indra/newview/skins/default/xui/en/panel_volume_pulldown.xml # indra/newview/skins/default/xui/en/widgets/menu_item_tear_off.xml # indra/newview/skins/default/xui/en/widgets/name_editor.xml # indra/newview/skins/default/xui/en/widgets/notification_list_view.xml # indra/newview/skins/default/xui/en/widgets/view_border.xml	2023-11-30 18:59:41 +01:00
Andrey Lihatskiy	c409236dac	Merge branch 'DRTVWR-594-maint-Y' into marchcat/594-y-pbr-merge ... # Conflicts: # indra/newview/llinventorygallery.cpp # indra/newview/skins/default/xui/en/notifications.xml	2023-11-30 18:09:29 +02:00
Andrey Lihatskiy	27dae1d967	Merge branch 'DRTVWR-591-maint-X' into marchcat/591-x-pbr-merge ... # Conflicts: # indra/llrender/llgl.cpp # indra/llrender/llvertexbuffer.cpp # indra/llui/llflatlistview.cpp # indra/newview/app_settings/settings.xml # indra/newview/lldrawpoolground.cpp # indra/newview/llinventorybridge.cpp # indra/newview/llinventorygallery.cpp # indra/newview/llspatialpartition.cpp # indra/newview/llviewercontrol.cpp # indra/newview/llviewertexture.cpp # indra/newview/llvosky.cpp # indra/newview/skins/default/xui/en/menu_inventory.xml	2023-11-30 13:30:27 +02:00
Andrey Lihatskiy	0465c761a4	Merge branch 'DRTVWR-588-maint-W' into marchcat/588-w-pbr-merge ... # Conflicts: # indra/llrender/llgl.cpp # indra/llrender/llvertexbuffer.cpp # indra/llui/llflatlistview.cpp # indra/newview/lldrawpoolground.cpp # indra/newview/llspatialpartition.cpp # indra/newview/lltexturefetch.cpp # indra/newview/llviewergenericmessage.cpp # indra/newview/llviewertexture.cpp # indra/newview/llvosky.cpp # indra/newview/skins/default/xui/en/floater_preferences_graphics_advanced.xml # indra/newview/skins/default/xui/en/floater_stats.xml # indra/newview/skins/default/xui/en/floater_texture_fetch_debugger.xml # indra/newview/skins/default/xui/en/notifications.xml # indra/newview/skins/default/xui/en/panel_performance_preferences.xml	2023-11-30 12:28:26 +02:00
Andrey Lihatskiy	d1c0a5b840	Merge branch 'DRTVWR-559' into marchcat/587-v-pbr-merge ... # Conflicts: # indra/llcommon/CMakeLists.txt # indra/newview/llspatialpartition.cpp # indra/newview/llviewergenericmessage.cpp # indra/newview/llvoavatar.cpp	2023-11-29 10:45:43 +02:00
Andrey Kleshchev	1fae237c15	SL-20610 Crash when unticking animesh on an attachment	2023-11-22 00:38:02 +02:00
Andrey Lihatskiy	e1fc7679f2	DRTVWR-594 Update contributions.txt	2023-11-09 23:21:18 +02:00
Ansariel	63f30264ff	Merge branch 'DRTVWR-591-maint-X' of https://github.com/secondlife/viewer ... # Conflicts: # indra/llui/lltransutil.cpp # indra/llwindow/llwindowmacosx.cpp # indra/llwindow/llwindowmacosx.h # indra/newview/app_settings/settings.xml # indra/newview/llavatarpropertiesprocessor.cpp # indra/newview/llavatarpropertiesprocessor.h # indra/newview/llinspectavatar.cpp # indra/newview/llpanelprofile.cpp # indra/newview/llpanelprofile.h # indra/newview/llviewerjoystick.cpp	2023-10-26 20:58:56 +02:00
Andrey Lihatskiy	1e47b78f17	SL-20524 Update contributions.txt	2023-10-24 19:14:26 +03:00
Ansariel	866e71d1f8	Merge branch 'DRTVWR-591-maint-X' of https://github.com/secondlife/viewer ... # Conflicts: # indra/llui/lllineeditor.cpp # indra/newview/installers/windows/installer_template.nsi # indra/newview/llappearancemgr.cpp # indra/newview/llavatarpropertiesprocessor.cpp # indra/newview/llavatarpropertiesprocessor.h # indra/newview/llgesturemgr.cpp # indra/newview/llgroupactions.cpp # indra/newview/lltoastalertpanel.cpp # indra/newview/skins/default/xui/en/floater_preview_gesture.xml # indra/newview/skins/default/xui/en/panel_group_general.xml # indra/newview/skins/default/xui/en/panel_group_info_sidetray.xml # indra/newview/skins/default/xui/en/strings.xml	2023-10-21 13:52:40 +02:00
Andrey Lihatskiy	e78556be9a	SL-20442 Update contributions.txt: name fix	2023-10-19 01:38:55 +03:00
Andrey Lihatskiy	8e7a39cfc6	SL-20442 Update contributions.txt	2023-10-19 01:32:07 +03:00
Ansariel	1966cd4ad6	Merge branch 'DRTVWR-489' of https://github.com/secondlife/viewer ... # Conflicts: # doc/contributions.txt # indra/llui/llfolderviewitem.cpp	2023-10-09 10:41:55 +02:00
Alexander Gavriliuk	e7f1466a7b	Merge branch main into DRTVWR-489	2023-10-08 14:01:05 +02:00
Ansariel	49bbb565b6	Merge branch 'DRTVWR-489' of https://github.com/secondlife/viewer ... # Conflicts: # indra/newview/llpanelemojicomplete.cpp # indra/newview/skins/default/xui/en/widgets/emoji_complete.xml	2023-10-04 16:56:32 +02:00
Ansariel	db78109245	Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm ... # Conflicts: # indra/newview/llinventorymodel.cpp	2023-10-04 12:37:51 +02:00