1928 Commits (5c03f284af4eeebe3ee26e8f69b1edc4570dd862)

Author	SHA1	Message	Date
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
Ansariel	0a928bf1fd	Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm ... # Conflicts: # indra/newview/CMakeLists.txt # indra/newview/VIEWER_VERSION.txt # indra/newview/llagent.cpp # indra/newview/llfloaternewfeaturenotification.cpp # indra/newview/llinventorybridge.cpp # indra/newview/llinventorymodel.cpp # indra/newview/lloutfitgallery.cpp # indra/newview/llpanelmaininventory.cpp # indra/newview/llpanelmaininventory.h # indra/newview/llsidepaneltaskinfo.cpp # indra/newview/llsidepaneltaskinfo.h # indra/newview/lltexturectrl.cpp # indra/newview/lltexturectrl.h # indra/newview/llviewerinventory.cpp # indra/newview/llviewerobject.cpp # indra/newview/llviewertexturelist.cpp # indra/newview/llviewertexturelist.h # indra/newview/skins/default/xui/en/floater_new_feature_notification.xml	2023-10-04 11:38:21 +02:00
Andrey Lihatskiy	d4123ec30d	Merge branch 'main' into DRTVWR-587-maint-V ... # Conflicts: # indra/newview/llinventorymodel.cpp # indra/newview/llvovolume.cpp	2023-10-03 19:25:19 +03:00
Andrey Kleshchev	7d50a51434	Merge branch 'main' (DRTVWR-567) into DRTVWR-559 ... # Conflicts: # indra/newview/CMakeLists.txt # indra/newview/VIEWER_VERSION.txt # indra/newview/llagent.cpp # indra/newview/llfloaternewfeaturenotification.cpp # indra/newview/llinventorybridge.cpp # indra/newview/llinventorymodel.cpp # indra/newview/lloutfitgallery.cpp # indra/newview/llpanelmaininventory.cpp # indra/newview/llpanelmaininventory.h # indra/newview/llsidepaneltaskinfo.cpp # indra/newview/llsidepaneltaskinfo.h # indra/newview/lltexturectrl.cpp # indra/newview/lltexturectrl.h # indra/newview/llviewerinventory.cpp # indra/newview/llviewerobject.cpp # indra/newview/llviewertexturelist.cpp # indra/newview/llviewertexturelist.h # indra/newview/skins/default/xui/en/floater_new_feature_notification.xml # indra/newview/skins/default/xui/en/menu_inventory.xml	2023-10-03 19:00:33 +03:00
Ansariel	ff5645511e	Merge branch 'DRTVWR-587-maint-V' of https://github.com/secondlife/viewer ... # Conflicts: # indra/cmake/Python.cmake # indra/newview/llvovolume.cpp	2023-09-09 11:40:54 +02:00
Andrey Kleshchev	fa29f4f0b1	SL-20224 Update contributions ... Fix builds using OpenAL	2023-08-29 20:44:27 +03:00
Ansariel	701cf51cd7	Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm ... # Conflicts: # indra/llcommon/llsdserialize.cpp # indra/llcommon/llsdserialize.h # indra/llmath/llvolume.cpp # indra/llrender/llgl.cpp # indra/llxml/llcontrol.cpp # indra/newview/llpanelnearbymedia.cpp # indra/newview/llsceneview.cpp # indra/newview/llselectmgr.cpp # indra/newview/llstartup.cpp # indra/newview/lltextureview.cpp # indra/newview/llvovolume.cpp # indra/newview/skins/default/xui/en/menu_viewer.xml	2023-08-25 02:57:48 +02:00
Ansariel	fc5a86a6cc	Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm ... # Conflicts: # indra/newview/app_settings/settings.xml # indra/newview/llappviewer.cpp # indra/newview/llinventoryfunctions.cpp # indra/newview/llinventoryfunctions.h # indra/newview/llinventorymodel.cpp # indra/newview/llinventoryobserver.cpp # indra/newview/llinventoryobserver.h	2023-08-25 01:19:32 +02:00
Ansariel	4b923d4291	Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm ... # Conflicts: # .github/workflows/build.yaml # indra/newview/VIEWER_VERSION.txt # indra/newview/llappviewer.cpp # indra/newview/llmeshrepository.cpp # indra/newview/llviewerregion.cpp # indra/newview/llviewerregion.h	2023-08-24 20:48:55 +02:00
Ansariel	2d64a54b1e	Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm ... # Conflicts: # autobuild.xml	2023-08-24 19:25:23 +02:00
Andrey Kleshchev	7373fd91fa	Merge remote-tracking branch 'origin/main' into DRTVWR-489 ... # Conflicts: # indra/llcommon/llsdserialize.cpp # indra/llcommon/llsdserialize.h # indra/llmath/llvolume.cpp # indra/llrender/llgl.cpp # indra/llxml/llcontrol.cpp # indra/newview/llpanelnearbymedia.cpp # indra/newview/llsceneview.cpp # indra/newview/llselectmgr.cpp # indra/newview/llstartup.cpp # indra/newview/lltextureview.cpp # indra/newview/llvovolume.cpp # indra/newview/skins/default/xui/en/menu_viewer.xml	2023-08-24 01:23:52 +03:00
Andrey Kleshchev	3d73a10da3	Merge branch main (DRTVWR-582) into DRTVWR-567 ... # Conflicts: # indra/newview/app_settings/settings.xml # indra/newview/llinventoryfunctions.cpp # indra/newview/llinventoryfunctions.h # indra/newview/llinventorymodel.cpp # indra/newview/llinventoryobserver.cpp # indra/newview/llinventoryobserver.h # indra/newview/skins/default/xui/ja/floater_inventory_item_properties.xml	2023-08-23 22:40:17 +03:00
Andrey Lihatskiy	d08859f3f4	Merge branch 'main' into DRTVWR-587-maint-V ... # Conflicts: # autobuild.xml	2023-08-23 22:28:01 +03:00
Brad Linden	c6d5f11f63	Merge remote-tracking branch 'origin/main' into DRTVWR-559	2023-08-23 12:26:14 -07:00
Ansariel	5c8b25521e	Merge branch 'DRTVWR-587-maint-V' of https://github.com/secondlife/viewer	2023-07-25 15:06:37 +02:00
Andrey Lihatskiy	4a19e601ea	SL-20054 Update contributions.txt	2023-07-24 20:50:24 +03:00
Callum Prentice	c5d7f3c4c1	DRTVWR-489: trivial merge conflict fix	2023-07-18 10:51:51 -07:00
Ansariel	e85546fc3d	Merge branch 'DRTVWR-559' of https://github.com/secondlife/viewer ... # Conflicts: # doc/contributions.txt # indra/newview/app_settings/settings.xml # indra/newview/lldrawpoolalpha.cpp # indra/newview/llfilepicker.cpp # indra/newview/llpanelface.cpp # indra/newview/skins/default/xui/en/notifications.xml	2023-07-18 11:17:02 +02:00
Ansariel	181ac13338	Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm ... # Conflicts: # indra/llcommon/llerrorthread.cpp	2023-07-18 11:09:03 +02:00
Ansariel	289fb458f3	Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm ... # Conflicts: # doc/contributions.txt # indra/llprimitive/llmaterial.h # indra/newview/VIEWER_VERSION.txt # indra/newview/lldrawpool.cpp # indra/newview/lldrawpoolalpha.cpp # indra/newview/llfilepicker.cpp # indra/newview/llfilepicker.h # indra/newview/llpanelface.cpp # indra/newview/llviewermenufile.cpp # indra/newview/llvovolume.cpp	2023-07-18 10:59:02 +02:00
Ansariel	6ee5d6053f	Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm ... # Conflicts: # indra/llui/llfolderviewitem.cpp # indra/newview/llinventorymodel.cpp # indra/newview/llinventorymodelbackgroundfetch.cpp # indra/newview/llinventorypanel.cpp # indra/newview/skins/default/xui/de/notifications.xml	2023-07-18 10:22:07 +02:00
Ansariel	e0c061d1c5	Merge branch 'DRTVWR-582-maint-U' of https://github.com/secondlife/viewer ... # Conflicts: # indra/newview/skins/default/xui/ja/control_table_contents_camera.xml # indra/newview/skins/default/xui/ja/control_table_contents_columns_basic.xml # indra/newview/skins/default/xui/ja/control_table_contents_editing.xml # indra/newview/skins/default/xui/ja/control_table_contents_media.xml # indra/newview/skins/default/xui/ja/control_table_contents_movement.xml # indra/newview/skins/default/xui/ja/floater_about_land.xml # indra/newview/skins/default/xui/ja/floater_adjust_environment.xml # indra/newview/skins/default/xui/ja/floater_avatar_picker.xml # indra/newview/skins/default/xui/ja/floater_avatar_textures.xml # indra/newview/skins/default/xui/ja/floater_beacons.xml # indra/newview/skins/default/xui/ja/floater_bulk_perms.xml # indra/newview/skins/default/xui/ja/floater_camera.xml # indra/newview/skins/default/xui/ja/floater_camera_presets.xml # indra/newview/skins/default/xui/ja/floater_conversation_log.xml # indra/newview/skins/default/xui/ja/floater_conversation_preview.xml # indra/newview/skins/default/xui/ja/floater_create_landmark.xml # indra/newview/skins/default/xui/ja/floater_delete_pref_preset.xml # indra/newview/skins/default/xui/ja/floater_edit_ext_day_cycle.xml # indra/newview/skins/default/xui/ja/floater_experienceprofile.xml # indra/newview/skins/default/xui/ja/floater_fixedenvironment.xml # indra/newview/skins/default/xui/ja/floater_im_container.xml # indra/newview/skins/default/xui/ja/floater_im_session.xml # indra/newview/skins/default/xui/ja/floater_incoming_call.xml # indra/newview/skins/default/xui/ja/floater_inspect.xml # indra/newview/skins/default/xui/ja/floater_inventory_item_properties.xml # indra/newview/skins/default/xui/ja/floater_joystick.xml # indra/newview/skins/default/xui/ja/floater_lagmeter.xml # indra/newview/skins/default/xui/ja/floater_load_pref_preset.xml # indra/newview/skins/default/xui/ja/floater_map.xml # indra/newview/skins/default/xui/ja/floater_model_preview.xml # indra/newview/skins/default/xui/ja/floater_moveview.xml # indra/newview/skins/default/xui/ja/floater_my_environments.xml # indra/newview/skins/default/xui/ja/floater_openobject.xml # indra/newview/skins/default/xui/ja/floater_outfit_photo_preview.xml # indra/newview/skins/default/xui/ja/floater_pathfinding_console.xml # indra/newview/skins/default/xui/ja/floater_pathfinding_linksets.xml # indra/newview/skins/default/xui/ja/floater_people.xml # indra/newview/skins/default/xui/ja/floater_perms_default.xml # indra/newview/skins/default/xui/ja/floater_pick_track.xml # indra/newview/skins/default/xui/ja/floater_preferences.xml # indra/newview/skins/default/xui/ja/floater_preferences_graphics_advanced.xml # indra/newview/skins/default/xui/ja/floater_preferences_view_advanced.xml # indra/newview/skins/default/xui/ja/floater_preview_animation.xml # indra/newview/skins/default/xui/ja/floater_preview_notecard.xml # indra/newview/skins/default/xui/ja/floater_preview_texture.xml # indra/newview/skins/default/xui/ja/floater_profile.xml # indra/newview/skins/default/xui/ja/floater_report_abuse.xml # indra/newview/skins/default/xui/ja/floater_save_camera_preset.xml # indra/newview/skins/default/xui/ja/floater_save_pref_preset.xml # indra/newview/skins/default/xui/ja/floater_select_key.xml # indra/newview/skins/default/xui/ja/floater_settings_debug.xml # indra/newview/skins/default/xui/ja/floater_settings_picker.xml # indra/newview/skins/default/xui/ja/floater_snapshot.xml # indra/newview/skins/default/xui/ja/floater_stats.xml # indra/newview/skins/default/xui/ja/floater_texture_ctrl.xml # indra/newview/skins/default/xui/ja/floater_tools.xml # indra/newview/skins/default/xui/ja/floater_top_objects.xml # indra/newview/skins/default/xui/ja/floater_voice_volume.xml # indra/newview/skins/default/xui/ja/floater_whitelist_entry.xml # indra/newview/skins/default/xui/ja/floater_world_map.xml # indra/newview/skins/default/xui/ja/menu_add_wearable_gear.xml # indra/newview/skins/default/xui/ja/menu_attachment_other.xml # indra/newview/skins/default/xui/ja/menu_attachment_self.xml # indra/newview/skins/default/xui/ja/menu_avatar_icon.xml # indra/newview/skins/default/xui/ja/menu_avatar_other.xml # indra/newview/skins/default/xui/ja/menu_avatar_self.xml # indra/newview/skins/default/xui/ja/menu_cof_gear.xml # indra/newview/skins/default/xui/ja/menu_conversation.xml # indra/newview/skins/default/xui/ja/menu_conversation_log_gear.xml # indra/newview/skins/default/xui/ja/menu_conversation_log_view.xml # indra/newview/skins/default/xui/ja/menu_favorites.xml # indra/newview/skins/default/xui/ja/menu_gesture_gear.xml # indra/newview/skins/default/xui/ja/menu_group_plus.xml # indra/newview/skins/default/xui/ja/menu_hide_navbar.xml # indra/newview/skins/default/xui/ja/menu_im_conversation.xml # indra/newview/skins/default/xui/ja/menu_im_session_showmodes.xml # indra/newview/skins/default/xui/ja/menu_inventory.xml # indra/newview/skins/default/xui/ja/menu_inventory_add.xml # indra/newview/skins/default/xui/ja/menu_inventory_gear_default.xml # indra/newview/skins/default/xui/ja/menu_inventory_search_visibility.xml # indra/newview/skins/default/xui/ja/menu_login.xml # indra/newview/skins/default/xui/ja/menu_mini_map.xml # indra/newview/skins/default/xui/ja/menu_object.xml # indra/newview/skins/default/xui/ja/menu_outfit_gear.xml # indra/newview/skins/default/xui/ja/menu_participant_list.xml # indra/newview/skins/default/xui/ja/menu_participant_view.xml # indra/newview/skins/default/xui/ja/menu_people_blocked_gear.xml # indra/newview/skins/default/xui/ja/menu_people_blocked_plus.xml # indra/newview/skins/default/xui/ja/menu_people_blocked_view.xml # indra/newview/skins/default/xui/ja/menu_people_friends_view.xml # indra/newview/skins/default/xui/ja/menu_people_nearby.xml # indra/newview/skins/default/xui/ja/menu_people_nearby_multiselect.xml # indra/newview/skins/default/xui/ja/menu_people_recent_view.xml # indra/newview/skins/default/xui/ja/menu_picks.xml # indra/newview/skins/default/xui/ja/menu_places_gear_folder.xml # indra/newview/skins/default/xui/ja/menu_places_gear_landmark.xml # indra/newview/skins/default/xui/ja/menu_places_gear_sorting.xml # indra/newview/skins/default/xui/ja/menu_profile_overflow.xml # indra/newview/skins/default/xui/ja/menu_save_settings.xml # indra/newview/skins/default/xui/ja/menu_settings_gear.xml # indra/newview/skins/default/xui/ja/menu_teleport_history_gear.xml # indra/newview/skins/default/xui/ja/menu_teleport_history_item.xml # indra/newview/skins/default/xui/ja/menu_toolbars.xml # indra/newview/skins/default/xui/ja/menu_url_agent.xml # indra/newview/skins/default/xui/ja/menu_url_experience.xml # indra/newview/skins/default/xui/ja/menu_url_group.xml # indra/newview/skins/default/xui/ja/menu_viewer.xml # indra/newview/skins/default/xui/ja/menu_wearing_tab.xml # indra/newview/skins/default/xui/ja/notifications.xml # indra/newview/skins/default/xui/ja/panel_avatar_list_item.xml # indra/newview/skins/default/xui/ja/panel_block_list_sidetray.xml # indra/newview/skins/default/xui/ja/panel_bottomtray_lite.xml # indra/newview/skins/default/xui/ja/panel_camera_preset_item.xml # indra/newview/skins/default/xui/ja/panel_cof_wearables.xml # indra/newview/skins/default/xui/ja/panel_conversation_list_item.xml # indra/newview/skins/default/xui/ja/panel_conversation_log_list_item.xml # indra/newview/skins/default/xui/ja/panel_edit_shape.xml # indra/newview/skins/default/xui/ja/panel_edit_tattoo.xml # indra/newview/skins/default/xui/ja/panel_edit_universal.xml # indra/newview/skins/default/xui/ja/panel_experience_info.xml # indra/newview/skins/default/xui/ja/panel_experience_list_editor.xml # indra/newview/skins/default/xui/ja/panel_experience_list_item.xml # indra/newview/skins/default/xui/ja/panel_experience_log.xml # indra/newview/skins/default/xui/ja/panel_experience_search.xml # indra/newview/skins/default/xui/ja/panel_experiences.xml # indra/newview/skins/default/xui/ja/panel_group_creation_sidetray.xml # indra/newview/skins/default/xui/ja/panel_group_general.xml # indra/newview/skins/default/xui/ja/panel_group_info_sidetray.xml # indra/newview/skins/default/xui/ja/panel_group_land_money.xml # indra/newview/skins/default/xui/ja/panel_group_list_item.xml # indra/newview/skins/default/xui/ja/panel_group_notices.xml # indra/newview/skins/default/xui/ja/panel_group_notify.xml # indra/newview/skins/default/xui/ja/panel_group_roles.xml # indra/newview/skins/default/xui/ja/panel_landmark_info.xml # indra/newview/skins/default/xui/ja/panel_landmarks.xml # indra/newview/skins/default/xui/ja/panel_login.xml # indra/newview/skins/default/xui/ja/panel_login_first.xml # indra/newview/skins/default/xui/ja/panel_main_inventory.xml # indra/newview/skins/default/xui/ja/panel_notification_list_item.xml # indra/newview/skins/default/xui/ja/panel_outfit_edit.xml # indra/newview/skins/default/xui/ja/panel_outfit_gallery.xml # indra/newview/skins/default/xui/ja/panel_outfit_gallery_item.xml # indra/newview/skins/default/xui/ja/panel_outfit_snapshot_inventory.xml # indra/newview/skins/default/xui/ja/panel_outfits_inventory.xml # indra/newview/skins/default/xui/ja/panel_people.xml # indra/newview/skins/default/xui/ja/panel_places.xml # indra/newview/skins/default/xui/ja/panel_postcard_message.xml # indra/newview/skins/default/xui/ja/panel_postcard_settings.xml # indra/newview/skins/default/xui/ja/panel_preferences_advanced.xml # indra/newview/skins/default/xui/ja/panel_preferences_alerts.xml # indra/newview/skins/default/xui/ja/panel_preferences_chat.xml # indra/newview/skins/default/xui/ja/panel_preferences_colors.xml # indra/newview/skins/default/xui/ja/panel_preferences_controls.xml # indra/newview/skins/default/xui/ja/panel_preferences_general.xml # indra/newview/skins/default/xui/ja/panel_preferences_graphics1.xml # indra/newview/skins/default/xui/ja/panel_preferences_move.xml # indra/newview/skins/default/xui/ja/panel_preferences_privacy.xml # indra/newview/skins/default/xui/ja/panel_preferences_setup.xml # indra/newview/skins/default/xui/ja/panel_preferences_sound.xml # indra/newview/skins/default/xui/ja/panel_presets_camera_pulldown.xml # indra/newview/skins/default/xui/ja/panel_profile_picks.xml # indra/newview/skins/default/xui/ja/panel_profile_secondlife.xml # indra/newview/skins/default/xui/ja/panel_region_environment.xml # indra/newview/skins/default/xui/ja/panel_region_estate.xml # indra/newview/skins/default/xui/ja/panel_region_experiences.xml # indra/newview/skins/default/xui/ja/panel_region_terrain.xml # indra/newview/skins/default/xui/ja/panel_script_ed.xml # indra/newview/skins/default/xui/ja/panel_script_experience.xml # indra/newview/skins/default/xui/ja/panel_settings_sky_atmos.xml # indra/newview/skins/default/xui/ja/panel_settings_sky_clouds.xml # indra/newview/skins/default/xui/ja/panel_settings_sky_density.xml # indra/newview/skins/default/xui/ja/panel_settings_sky_sunmoon.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/panel_snapshot_local.xml # indra/newview/skins/default/xui/ja/panel_snapshot_options.xml # indra/newview/skins/default/xui/ja/panel_snapshot_postcard.xml # indra/newview/skins/default/xui/ja/panel_snapshot_profile.xml # indra/newview/skins/default/xui/ja/panel_sound_devices.xml # indra/newview/skins/default/xui/ja/panel_status_bar.xml # indra/newview/skins/default/xui/ja/panel_tools_texture.xml # indra/newview/skins/default/xui/ja/role_actions.xml # indra/newview/skins/default/xui/ja/sidepanel_appearance.xml # indra/newview/skins/default/xui/ja/sidepanel_item_info.xml # indra/newview/skins/default/xui/ja/sidepanel_task_info.xml # indra/newview/skins/default/xui/ja/strings.xml # indra/newview/skins/default/xui/ja/teleport_strings.xml # indra/newview/skins/default/xui/ja/widgets/bodyparts_list_item.xml # indra/newview/skins/default/xui/ja/widgets/clothing_list_item.xml # indra/newview/skins/default/xui/ja/widgets/deletable_wearable_list_item.xml # indra/newview/skins/default/xui/ja/widgets/density_ctrl.xml # indra/newview/skins/default/xui/ja/widgets/dummy_clothing_list_item.xml # indra/newview/skins/default/xui/ja/widgets/flat_list_view.xml # indra/newview/skins/default/xui/ja/widgets/inbox_folder_view_folder.xml # indra/newview/skins/default/xui/ja/widgets/inbox_folder_view_item.xml # indra/newview/skins/default/xui/ja/widgets/name_editor.xml # indra/newview/skins/default/xui/ja/widgets/panel_camera_item.xml # indra/newview/skins/default/xui/ja/widgets/person_view.xml # indra/newview/skins/default/xui/ja/widgets/sun_moon_trackball.xml	2023-07-18 00:48:02 +02:00
Ansariel	f00f624b8b	Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm ... # Conflicts: # doc/contributions.txt # indra/llcommon/llerrorthread.cpp	2023-07-18 00:45:10 +02:00
marchcat-pe	37f41392cd	Merge pull request #285 from secondlife/marchcat/SL-19669 ... INTL-490 Japanese Translation Update	2023-07-17 23:44:34 +03:00
Brad Linden	f975cfd736	Merge remote-tracking branch 'origin/main' into DRTVWR-559	2023-07-17 13:37:03 -07:00
Andrey Kleshchev	acf82867b6	Merge branch 'main' (DRTVWR-580) into DRTVWR-567 ... # Conflicts: # indra/llui/llfolderviewitem.cpp # indra/newview/llinventorymodel.cpp # indra/newview/llinventorymodelbackgroundfetch.cpp	2023-07-17 23:34:59 +03:00
Andrey Lihatskiy	07ff9a5d67	Merge branch 'main' into DRTVWR-582-maint-U ... # Conflicts: # doc/contributions.txt # indra/llcommon/llerrorthread.cpp	2023-07-17 23:17:29 +03:00
Andrey Lihatskiy	3790c9ed87	INTL-490 Japanese Translation Update ... provided by Logue Takacs	2023-05-28 06:28:30 +03:00
Ansariel	137f5d145e	Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm ... # Conflicts: # indra/newview/llagentlistener.cpp # indra/newview/llappviewer.cpp # indra/newview/llcommanddispatcherlistener.cpp # indra/newview/llfilepicker_mac.mm # indra/newview/llworldmapview.cpp	2023-05-18 14:03:52 +02:00
Ansariel	1d28a79ec6	Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm ... # Conflicts: # doc/contributions.txt # indra/llcharacter/llkeyframemotion.cpp # indra/newview/llappviewer.cpp # indra/newview/llfilepicker.cpp	2023-05-18 13:43:48 +02:00
Ansariel	ce7b2e96d0	Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm ... # Conflicts: # doc/contributions.txt # indra/llcommon/llsdserialize.cpp # indra/llcommon/llsdserialize.h # indra/llinventory/llsettingssky.cpp # indra/newview/llpathfindingnavmesh.cpp	2023-05-18 12:25:20 +02:00
Ansariel	3fed8d9fc4	Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm ... # Conflicts: # doc/contributions.txt # indra/llcommon/llsdserialize.cpp # indra/llcommon/llsdserialize.h # indra/newview/llpathfindingnavmesh.cpp	2023-05-17 23:33:50 +02:00
Andrey Lihatskiy	53ed0ec70c	Merge branch 'main' into DRTVWR-567 ... # Conflicts: # doc/contributions.txt	2023-05-17 23:57:11 +03:00
Ansariel	d927ba575a	Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm ... # Conflicts: # indra/llcommon/llqueuedthread.cpp # indra/llcommon/llqueuedthread.h # indra/llcommon/lluuid.cpp # indra/llcommon/llworkerthread.cpp # indra/llimage/llimageworker.h # indra/newview/VIEWER_VERSION.txt # indra/newview/llappviewer.cpp # indra/newview/llappviewerwin32.cpp # indra/newview/llfilepicker.cpp # indra/newview/lltexturefetch.cpp # indra/newview/llviewerdisplay.cpp # indra/newview/llviewermenu.cpp	2023-05-17 21:40:54 +02:00
Callum Prentice	f45e888c90	Some small tweaks after merge with Viewer release	2023-05-17 11:31:45 -07:00
Brad Linden	2f44377b3e	Merge remote-tracking branch 'origin/main' into DRTVWR-559	2023-05-17 11:17:48 -07:00
Ansariel	61fffbf661	Merge branch 'main' of https://github.com/secondlife/viewer ... # Conflicts: # indra/llinventory/llsettingswater.cpp	2023-05-17 18:05:52 +02:00
Andrey Lihatskiy	033b04f388	Merge branch 'main' into DRTVWR-582-maint-U ... # Conflicts: # indra/newview/llagentlistener.cpp # indra/newview/llcommanddispatcherlistener.cpp # indra/newview/llfilepicker_mac.mm # indra/newview/llworldmapview.cpp	2023-05-17 18:05:05 +03:00
Andrey Lihatskiy	4dcab10bf8	Merge branch 'main' into DRTVWR-580-maint-T ... # Conflicts: # doc/contributions.txt # indra/llcharacter/llkeyframemotion.cpp # indra/newview/llfilepicker.cpp	2023-05-17 17:47:45 +03:00
Ansariel	8e9b3a8f37	Merge branch 'DRTVWR-559' of https://github.com/secondlife/viewer ... # Conflicts: # indra/llaudio/llaudiodecodemgr.cpp # indra/llwindow/llwindowwin32.cpp # indra/newview/llperfstats.cpp # indra/newview/llperfstats.h # indra/newview/llvoavatar.cpp # indra/newview/llvoavatar.h # indra/newview/pipeline.cpp	2023-05-12 12:06:57 +02:00
Andrey Kleshchev	250228af25	SL-19660 Updated contributions doc	2023-05-09 17:58:13 +03:00
Andrey Kleshchev	6d0d9b8e54	SL-19690 Updated contribution doc	2023-05-08 18:28:33 +03:00
Ansariel	ce51a6b408	Merge branch 'DRTVWR-580-maint-T' of https://github.com/secondlife/viewer ... # Conflicts: # indra/llinventory/llsettingssky.cpp # indra/newview/llappviewer.cpp	2023-05-05 09:38:09 +02:00
Andrey Kleshchev	7ebf98713c	SL-19681 Updated list of contributors	2023-05-03 19:53:38 +03:00
Ansariel	ca3b0c59ed	Merge branch 'DRTVWR-489' of https://github.com/secondlife/viewer ... # Conflicts: # indra/llui/llemojidictionary.cpp # indra/newview/llfloateremojipicker.cpp # indra/newview/skins/default/xui/en/floater_emoji_picker.xml	2023-05-03 14:10:11 +02:00
Ansariel	5572a4c392	Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm ... # Conflicts: # autobuild.xml	2023-05-03 13:11:42 +02:00
Ansariel	bee42f1fd0	Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm ... # Conflicts: # indra/newview/llappviewer.cpp	2023-05-03 10:58:47 +02:00
Ansariel	dd1940e9bc	Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm	2023-05-03 10:05:23 +02:00
Callum Prentice	bb96ac2621	MErge with main after Viewer release	2023-05-02 09:39:03 -07:00
Ansariel	523662a5c8	Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm	2023-05-02 18:22:32 +02:00
Ansariel	2a6c81f1d6	Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm	2023-05-02 17:52:00 +02:00
Andrey Lihatskiy	ade8c96e5c	Merge branch 'main' into DRTVWR-567 ... # Conflicts: # indra/newview/llappviewer.cpp	2023-05-02 17:57:11 +03:00
Andrey Lihatskiy	ff8dcc23bf	Merge branch 'main' into DRTVWR-577-maint-S	2023-05-02 17:39:37 +03:00
Andrey Lihatskiy	504ef7e9e3	Merge branch 'main' into DRTVWR-580-maint-T	2023-05-02 17:39:29 +03:00
Andrey Lihatskiy	1444c4a23c	Merge branch 'main' into DRTVWR-582-maint-U	2023-05-02 17:39:13 +03:00
Ansariel	ffa21ae649	Merge branch 'master' of https://vcs.firestormviewer.org/viewer-merges/phoenix-firestorm-539 ... # Conflicts: # autobuild.xml # indra/newview/app_settings/settings.xml # indra/newview/featuretable_linux.txt # indra/newview/fsfloaterperformance.cpp # indra/newview/llappviewer.cpp # indra/newview/lldrawpool.cpp # indra/newview/lldrawpoolalpha.cpp # indra/newview/lldrawpoolbump.cpp # indra/newview/lldrawpoolmaterials.cpp # indra/newview/llfeaturemanager.cpp # indra/newview/llperfstats.cpp # indra/newview/llperfstats.h # indra/newview/llviewercontrol.cpp # indra/newview/llviewerdisplay.cpp # indra/newview/llviewertexturelist.cpp # indra/newview/llvovolume.cpp # indra/newview/pipeline.cpp	2023-04-28 00:39:47 +02:00
Brad Linden	369945b45d	Merge remote-tracking branch 'origin/DRTVWR-539' into DRTVWR-559-merge-539	2023-04-26 15:38:47 -07:00
Alexander Gavriliuk	fbf5b199f3	SL-19575 LLFloaterEmojiPicker - code cleanup and layout fixup	2023-04-25 13:14:48 +02:00
Ansariel	719a2d31dc	Merge branch 'DRTVWR-489' of https://github.com/secondlife/viewer ... # Conflicts: # autobuild.xml # indra/llcommon/CMakeLists.txt # indra/llui/llscrolllistctrl.h # indra/newview/CMakeLists.txt # indra/newview/llviewerfloaterreg.cpp # indra/newview/skins/default/textures/textures.xml	2023-04-22 12:02:23 +02:00
Ansariel	da32456165	Merge branch 'master' of https://vcs.firestormviewer.org/viewer-merges/phoenix-firestorm-contribute ... # Conflicts: # indra/cmake/CMakeLists.txt # indra/llcommon/tests/llleap_test.cpp # indra/newview/skins/default/xui/en/strings.xml	2023-04-21 12:38:19 +02:00
Andrey Kleshchev	dc5ef88e31	SL-19623 Updated contributions	2023-04-19 20:31:37 +03:00
Callum Prentice	978a5b66f2	SL-19139 Credits for Kitty - update the contributors.txt file with a mention of Kitty's large contribution. (No externally facing JIRA that I can find)	2023-04-11 11:26:37 -07:00
Andrey Lihatskiy	f1095d7831	Merge branch 'main' into marchcat/main-contrib-merge ... # Conflicts: # indra/cmake/CMakeLists.txt # indra/llcommon/llsdserialize.cpp # indra/llcommon/llsdserialize.h # indra/llcommon/tests/llleap_test.cpp # indra/newview/llfilepicker.h # indra/newview/llfilepicker_mac.h # indra/newview/llfilepicker_mac.mm # indra/newview/skins/default/xui/en/strings.xml	2023-04-07 00:20:59 +03:00
Ansariel	68e5f326b3	Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm ... # Conflicts: # .gitignore # indra/cmake/00-Common.cmake # indra/cmake/CMakeLists.txt # indra/cmake/GLEXT.cmake # indra/cmake/LLCommon.cmake # indra/cmake/LLMath.cmake # indra/cmake/LLRender.cmake # indra/cmake/Tracy.cmake # indra/llprimitive/CMakeLists.txt # indra/llrender/llglheaders.h # indra/llrender/llglslshader.cpp # indra/newview/VIEWER_VERSION.txt # indra/newview/llface.cpp # indra/newview/lltexturefetch.h # indra/newview/llviewerobjectlist.cpp # indra/newview/llviewertexturelist.cpp # indra/newview/llvopartgroup.cpp # indra/newview/llxmlrpctransaction.cpp	2023-03-31 18:54:16 +02:00
Ansariel	95e73bf131	Merge branch 'DRTVWR-559' of https://github.com/secondlife/viewer ... # Conflicts: # indra/newview/app_settings/settings.xml # indra/newview/featuretable.txt # indra/newview/featuretable_mac.txt # indra/newview/llviewermedia.cpp	2023-03-31 17:03:50 +02:00
Ansariel	49c8ce2b07	Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm ... # Conflicts: # indra/newview/llinventoryfunctions.cpp # indra/newview/llpanelmaininventory.h # indra/newview/skins/default/xui/en/sidepanel_item_info.xml	2023-03-30 14:53:12 +02:00
Maxim Nikolenko	198cd4df09	Merge branch 'main' into DRTVWR-567 ... # Conflicts: # indra/newview/llinventoryfunctions.cpp # indra/newview/llpanelmaininventory.h # indra/newview/skins/default/xui/en/floater_inventory_item_properties.xml # indra/newview/skins/default/xui/en/sidepanel_item_info.xml	2023-03-30 14:09:50 +03:00
Ansariel	c7fe346ff0	Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm ... # Conflicts: # indra/llrender/llimagegl.cpp	2023-03-30 13:06:36 +02:00
Ansariel	36fc36432d	Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm ... # Conflicts: # indra/cmake/CMakeLists.txt	2023-03-30 12:20:59 +02:00
Brad Linden	a548c16989	Merge remote-tracking branch 'origin/main' into DRTVWR-559	2023-03-29 14:54:06 -07:00
Andrey Lihatskiy	7b2205d8f6	Merge branch 'main' into DRTVWR-580-maint-T	2023-03-30 00:39:12 +03:00
Andrey Lihatskiy	5217e6bfb7	Merge branch 'main' into DRTVWR-577-maint-S ... # Conflicts: # indra/cmake/CMakeLists.txt # indra/newview/skins/default/xui/es/floater_tools.xml	2023-03-30 00:25:16 +03:00
Ansariel	aac7c60449	Merge branch 'DRTVWR-577-maint-S' of https://github.com/secondlife/viewer ... # Conflicts: # autobuild.xml # indra/newview/app_settings/settings.xml # indra/newview/llappviewerwin32.cpp	2023-03-28 18:07:46 +02:00
Cosmic Linden	00997b997e	SL-19399: Thanks to Ai Austin for PBR material editing improvement idea	2023-03-22 17:11:19 -07:00
Andrey Lihatskiy	d080ec2808	SL-4126 Updated contributions.txt	2023-03-22 19:09:26 +02:00
Ansariel	2c51fe5aad	Merge branch 'DRTVWR-580-maint-T' of https://github.com/secondlife/viewer ... # Conflicts: # indra/newview/app_settings/settings.xml # indra/newview/llfilepicker.cpp # indra/newview/llpanelface.cpp # indra/newview/llpanelface.h # indra/newview/llpanelwearing.cpp # indra/newview/llvovolume.cpp	2023-03-22 17:35:43 +01:00
Ansariel	40b731eb76	Merge branch 'master' of https://vcs.firestormviewer.org/viewer-merges/phoenix-firestorm-568 ... # Conflicts: # .gitignore # indra/cmake/FindOpenJPEG.cmake # indra/cmake/FreeType.cmake # indra/cmake/OpenJPEG.cmake # indra/cmake/UI.cmake # indra/cmake/ViewerMiscLibs.cmake # indra/llwindow/CMakeLists.txt # indra/newview/CMakeLists.txt # indra/newview/viewer_manifest.py	2023-03-21 10:57:56 +01:00
Andrey Lihatskiy	dca3c83cd9	Merge branch 'DRTVWR-568' into DRTVWR-573-maint-R ... # Conflicts: # indra/cmake/Copy3rdPartyLibs.cmake # indra/cmake/FindOpenJPEG.cmake # indra/cmake/OpenJPEG.cmake # indra/integration_tests/llui_libtest/CMakeLists.txt # indra/newview/CMakeLists.txt	2023-03-20 01:23:16 +02:00
Ansariel	adde408b18	Merge branch 'DRTVWR-539' of https://github.com/secondlife/viewer ... # Conflicts: # indra/newview/llfloaterpreference.h # indra/newview/llstartup.cpp # indra/newview/llvovolume.cpp	2023-03-07 14:57:47 +01:00
Rye Mutt	cdb3c018af	SL-19336 Unload avatar and group icons from memory when not visible to reduce memory pressure on extremely large friends lists	2023-03-03 19:44:22 +02:00
Mnikolenko Productengine	7298a049a7	SL-19317 fix for avatar attachment accounting	2023-03-02 18:00:11 +02:00
Ansariel	f65cddf860	Merge branch 'contribute' of https://github.com/secondlife/viewer ... # Conflicts: # autobuild.xml # indra/llcommon/llsdserialize.cpp # indra/llcommon/lluuid.cpp # indra/llcommon/lluuid.h # indra/llprimitive/llmodel.cpp # indra/newview/llfilepicker.cpp # indra/newview/llfilepicker.h # indra/newview/llfilepicker_mac.h # indra/newview/llfilepicker_mac.mm # indra/newview/llinventorymodel.cpp # indra/newview/llviewerwearable.h # indra/newview/skins/default/xui/da/floater_about.xml # indra/newview/skins/default/xui/da/floater_fs_voice_controls.xml # indra/newview/skins/default/xui/da/menu_inspect_self_gear.xml # indra/newview/skins/default/xui/de/floater_about.xml # indra/newview/skins/default/xui/de/floater_perm_prefs.xml # indra/newview/skins/default/xui/de/menu_inspect_avatar_gear.xml # indra/newview/skins/default/xui/de/menu_inspect_self_gear.xml # indra/newview/skins/default/xui/en/floater_about.xml # indra/newview/skins/default/xui/en/strings.xml # indra/newview/skins/default/xui/es/floater_about.xml # indra/newview/skins/default/xui/es/menu_inspect_avatar_gear.xml # indra/newview/skins/default/xui/es/menu_inspect_self_gear.xml # indra/newview/skins/default/xui/fr/floater_about.xml # indra/newview/skins/default/xui/fr/floater_perm_prefs.xml # indra/newview/skins/default/xui/fr/menu_inspect_avatar_gear.xml # indra/newview/skins/default/xui/fr/menu_inspect_self_gear.xml # indra/newview/skins/default/xui/it/floater_about.xml # indra/newview/skins/default/xui/it/floater_perm_prefs.xml # indra/newview/skins/default/xui/it/menu_inspect_avatar_gear.xml # indra/newview/skins/default/xui/it/menu_inspect_self_gear.xml # indra/newview/skins/default/xui/ja/floater_fs_voice_controls.xml # indra/newview/skins/default/xui/ja/menu_inspect_self_gear.xml # indra/newview/skins/default/xui/pl/floater_about.xml # indra/newview/skins/default/xui/pl/floater_about_land.xml # indra/newview/skins/default/xui/pl/floater_animation_bvh_preview.xml # indra/newview/skins/default/xui/pl/floater_associate_listing.xml # indra/newview/skins/default/xui/pl/notifications.xml # indra/newview/skins/default/xui/pl/panel_group_creation_sidetray.xml # indra/newview/skins/default/xui/pl/panel_outfit_gallery.xml # indra/newview/skins/default/xui/pl/panel_outfit_snapshot_inventory.xml # indra/newview/skins/default/xui/pl/panel_profile_firstlife.xml # indra/newview/skins/default/xui/pl/panel_profile_pick.xml # indra/newview/skins/default/xui/pl/panel_profile_picks.xml # indra/newview/skins/default/xui/pl/panel_profile_secondlife.xml # indra/newview/skins/default/xui/pl/panel_region_access.xml # indra/newview/skins/default/xui/pl/panel_script_experience.xml # indra/newview/skins/default/xui/pl/strings.xml # indra/newview/skins/default/xui/pt/floater_about.xml # indra/newview/skins/default/xui/pt/floater_fs_voice_controls.xml # indra/newview/skins/default/xui/pt/menu_inspect_self_gear.xml # indra/newview/skins/default/xui/ru/floater_about.xml # indra/newview/skins/default/xui/ru/floater_perm_prefs.xml # indra/newview/skins/default/xui/ru/menu_inspect_avatar_gear.xml # indra/newview/skins/default/xui/ru/menu_inspect_self_gear.xml # indra/newview/skins/default/xui/tr/floater_about.xml # indra/newview/skins/default/xui/tr/floater_fs_voice_controls.xml # indra/newview/skins/default/xui/tr/menu_inspect_self_gear.xml # indra/newview/skins/default/xui/zh/floater_about.xml # indra/newview/skins/default/xui/zh/floater_fs_voice_controls.xml # indra/newview/skins/default/xui/zh/menu_inspect_self_gear.xml	2023-03-01 12:54:24 +01:00
Ansariel	7731ee8d50	Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm ... # Conflicts: # indra/llcommon/llsdserialize.cpp # indra/llcommon/llsdserialize.h # indra/newview/llmeshrepository.cpp	2023-02-28 12:44:49 +01:00
Ansariel	998dc17eff	Merge branch 'DRTVWR-567' of https://github.com/secondlife/viewer ... # Conflicts: # indra/newview/llfloatermarketplacelistings.cpp # indra/newview/llfloatermarketplacelistings.h # indra/newview/llinventorybridge.cpp # indra/newview/llinventoryfunctions.cpp # indra/newview/skins/default/colors.xml # indra/newview/skins/default/xui/en/floater_snapshot.xml	2023-02-14 17:32:34 +01:00
Andrey Kleshchev	4bc9331ddd	SL-19140 Fix contribution doc	2023-02-14 18:04:46 +02:00