1796 Commits (master)

Author	SHA1	Message	Date
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
Ansariel	2bc4fb2bf0	Merge branch 'DRTVWR-567' of https://github.com/secondlife/viewer ... # Conflicts: # indra/llcommon/llqueuedthread.cpp # indra/llcommon/llsdserialize.cpp # indra/llcommon/llsdserialize.h # indra/llcommon/llthreadsafequeue.h # indra/llinventory/llsettingssky.cpp # indra/llui/llfolderviewitem.cpp # indra/llui/llview.h # indra/newview/llaisapi.cpp # indra/newview/llappviewer.cpp # indra/newview/llfloaterproperties.cpp # indra/newview/llfloaterproperties.h # indra/newview/llinventorybridge.cpp # indra/newview/llinventoryfunctions.cpp # indra/newview/llinventorypanel.cpp # indra/newview/llpanelmaininventory.cpp # indra/newview/llpanelmaininventory.h # indra/newview/llpanelmarketplaceinbox.cpp # indra/newview/llpanelprofile.cpp # indra/newview/llpanelprofile.h # indra/newview/llpathfindingnavmesh.cpp # indra/newview/llselectmgr.cpp # indra/newview/llsidepanelinventory.cpp # indra/newview/llsidepanelinventory.h # indra/newview/llsidepaneliteminfo.cpp # indra/newview/llsidepaneltaskinfo.cpp # indra/newview/llviewerfloaterreg.cpp # indra/newview/skins/default/xui/da/floater_inventory_item_properties.xml # indra/newview/skins/default/xui/de/floater_inventory_item_properties.xml # indra/newview/skins/default/xui/en/floater_inventory_item_properties.xml # indra/newview/skins/default/xui/en/menu_inventory_gear_default.xml # indra/newview/skins/default/xui/en/panel_main_inventory.xml # indra/newview/skins/default/xui/en/panel_profile_firstlife.xml # indra/newview/skins/default/xui/en/panel_profile_secondlife.xml # indra/newview/skins/default/xui/en/sidepanel_inventory.xml # indra/newview/skins/default/xui/en/sidepanel_item_info.xml # indra/newview/skins/default/xui/en/sidepanel_task_info.xml # indra/newview/skins/default/xui/es/floater_inventory_item_properties.xml # indra/newview/skins/default/xui/fr/floater_inventory_item_properties.xml # indra/newview/skins/default/xui/it/floater_inventory_item_properties.xml # indra/newview/skins/default/xui/ja/floater_inventory_item_properties.xml # indra/newview/skins/default/xui/pl/floater_inventory_item_properties.xml # indra/newview/skins/default/xui/ru/floater_inventory_item_properties.xml	2023-02-13 23:35:21 +01:00
Andrey Kleshchev	0630e95ce7	SL-19207 Update contributions document	2023-02-13 20:37:20 +02:00
Andrey Kleshchev	6c54c9f8a9	Merge branch 'main' into DRTVWR-577-maint-S ... # Conflicts: # indra/llcommon/llsdserialize.cpp # indra/llcommon/llsdserialize.h # indra/newview/llfilepicker.h # indra/newview/llfilepicker_mac.h # indra/newview/llfilepicker_mac.mm	2023-02-09 22:33:52 +02:00
Andrey Kleshchev	a2f8f3db06	SL-19159 Update contribution doc	2023-02-07 23:55:22 +02:00
Ansariel	fb727de6e3	Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm ... # Conflicts: # indra/llcommon/llsdserialize.cpp # indra/llcommon/llsdserialize.h # indra/newview/llfilepicker.h # indra/newview/llfilepicker_mac.h # indra/newview/llfilepicker_mac.mm # indra/newview/llmeshrepository.cpp	2023-02-03 22:33:41 +01:00
Ansariel	2ff9900cd9	Merge branch 'DRTVWR-577-maint-S' of https://github.com/secondlife/viewer ... # Conflicts: # autobuild.xml # indra/llcommon/lluuid.cpp # indra/llprimitive/llmodel.cpp # indra/newview/llfilepicker.cpp # indra/newview/llfilepicker_mac.mm # indra/newview/skins/default/xui/da/floater_about.xml # indra/newview/skins/default/xui/de/floater_about.xml # indra/newview/skins/default/xui/en/floater_about.xml # indra/newview/skins/default/xui/es/floater_about.xml # indra/newview/skins/default/xui/fr/floater_about.xml # indra/newview/skins/default/xui/it/floater_about.xml # indra/newview/skins/default/xui/pt/floater_about.xml # indra/newview/skins/default/xui/ru/floater_about.xml # indra/newview/skins/default/xui/tr/floater_about.xml # indra/newview/skins/default/xui/zh/floater_about.xml	2023-02-03 20:57:40 +01:00
Maxim Nikolenko	51142d1341	Merge branch 'main' into DRTVWR-567 ... # Conflicts: # indra/newview/llappearancemgr.cpp # indra/newview/llpanelmaininventory.cpp	2023-02-03 16:53:33 +02:00
Ansariel	06ac6c615c	Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm ... # Conflicts: # .gitignore # doc/contributions.txt # 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/llviewercontrol.cpp # indra/newview/viewer_manifest.py	2023-02-03 15:34:47 +01:00
Ansariel	73e5615d43	Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm ... # Conflicts: # indra/llimagej2coj/llimagej2coj.cpp # indra/newview/VIEWER_VERSION.txt # indra/newview/app_settings/shaders/class1/deferred/skyF.glsl # indra/newview/app_settings/shaders/class1/deferred/skyV.glsl # indra/newview/app_settings/shaders/class2/deferred/skyF.glsl # indra/newview/llsettingsvo.cpp	2023-02-03 11:11:13 +01:00
Mnikolenko Productengine	e7ba1753d2	Merge branch 'main' into DRTVWR-539 ... # Conflicts: # doc/contributions.txt # indra/cmake/Copy3rdPartyLibs.cmake # indra/cmake/FindOpenJPEG.cmake # indra/cmake/OpenJPEG.cmake # indra/integration_tests/llui_libtest/CMakeLists.txt # indra/newview/CMakeLists.txt	2023-02-03 01:46:01 +02:00
Brad Linden	5fabfa50d7	Merge remote-tracking branch 'origin/main' into DRTVWR-559	2023-02-02 12:11:40 -08:00
Andrey Lihatskiy	b2e3a07ab4	SL-18988 Updated contributions.txt	2023-02-01 16:38:47 +02:00
Ansariel	6cbca4da71	Merge branch 'DRTVWR-559' of https://github.com/secondlife/viewer ... # Conflicts: # indra/llcommon/llprofiler.h # indra/llcommon/lluuid.cpp # indra/llprimitive/llmodel.cpp # indra/llrender/llrendertarget.cpp # indra/newview/app_settings/settings.xml # indra/newview/app_settings/shaders/class1/deferred/multiPointLightF.glsl # indra/newview/app_settings/shaders/class1/deferred/pointLightF.glsl # indra/newview/llviewerwindow.cpp # indra/newview/pipeline.cpp # indra/newview/skins/default/xui/da/floater_about.xml # indra/newview/skins/default/xui/de/floater_about.xml # indra/newview/skins/default/xui/en/floater_about.xml # indra/newview/skins/default/xui/es/floater_about.xml # indra/newview/skins/default/xui/fr/floater_about.xml # indra/newview/skins/default/xui/it/floater_about.xml # indra/newview/skins/default/xui/pt/floater_about.xml # indra/newview/skins/default/xui/ru/floater_about.xml # indra/newview/skins/default/xui/tr/floater_about.xml # indra/newview/skins/default/xui/zh/floater_about.xml	2023-02-01 11:40:17 +01:00
Andrey Kleshchev	b5b0a3fbf6	SL-19110 Fix xxhash build link and properly register contribution	2023-01-31 22:05:42 +02:00
Andrey Kleshchev	8518154426	SL-19110 Fix xxhash build link and properly register contribution	2023-01-31 19:17:34 +02:00
Ansariel	8d154eaa8c	Merge branch 'contribute' of https://github.com/secondlife/viewer ... # Conflicts: # indra/llappearance/llavatarappearance.cpp # indra/llappearance/lldriverparam.cpp # indra/llappearance/llwearable.cpp # indra/llcommon/llerror.cpp # indra/llcommon/llqueuedthread.cpp # indra/llcommon/llsdserialize.h # indra/llcommon/llthreadsafequeue.h # indra/newview/app_settings/settings.xml # indra/newview/llpathfindingnavmesh.cpp # indra/newview/llviewerassetstorage.cpp # indra/newview/llviewerdisplay.cpp # indra/newview/skins/default/xui/de/floater_flickr.xml # indra/newview/skins/default/xui/de/panel_flickr_photo.xml # indra/newview/skins/default/xui/en/floater_about_land.xml # indra/newview/skins/default/xui/en/panel_settings_sky_atmos.xml # indra/newview/skins/default/xui/en/panel_settings_sky_clouds.xml # indra/newview/skins/default/xui/en/panel_settings_sky_sunmoon.xml # indra/newview/skins/default/xui/fr/floater_flickr.xml # indra/newview/skins/default/xui/fr/panel_flickr_account.xml # indra/newview/skins/default/xui/fr/panel_flickr_photo.xml # indra/newview/skins/default/xui/it/floater_flickr.xml # indra/newview/skins/default/xui/it/panel_flickr_photo.xml # indra/newview/skins/default/xui/ja/floater_flickr.xml # indra/newview/skins/default/xui/ja/panel_flickr_photo.xml # indra/newview/skins/default/xui/pl/floater_avatar_render_settings.xml # indra/newview/skins/default/xui/pl/floater_ban_duration.xml # indra/newview/skins/default/xui/pl/floater_camera_presets.xml # indra/newview/skins/default/xui/pl/floater_classified.xml # indra/newview/skins/default/xui/pl/floater_create_landmark.xml # indra/newview/skins/default/xui/pl/floater_delete_pref_preset.xml # indra/newview/skins/default/xui/pl/floater_fixedenvironment.xml # indra/newview/skins/default/xui/pl/floater_flickr.xml # indra/newview/skins/default/xui/pl/floater_linkreplace.xml # indra/newview/skins/default/xui/pl/floater_load_pref_preset.xml # indra/newview/skins/default/xui/pl/floater_my_environments.xml # indra/newview/skins/default/xui/pl/floater_my_scripts.xml # indra/newview/skins/default/xui/pl/floater_notifications_tabbed.xml # indra/newview/skins/default/xui/pl/floater_pick_track.xml # indra/newview/skins/default/xui/pl/floater_preferences_graphics_advanced.xml # indra/newview/skins/default/xui/pl/floater_preferences_view_advanced.xml # indra/newview/skins/default/xui/pl/floater_preview_trash.xml # indra/newview/skins/default/xui/pl/floater_profile.xml # indra/newview/skins/default/xui/pl/floater_settings_picker.xml # indra/newview/skins/default/xui/pl/floater_simple_outfit_snapshot.xml # indra/newview/skins/default/xui/pl/menu_avatar_rendering_settings.xml # indra/newview/skins/default/xui/pl/menu_avatar_rendering_settings_add.xml # indra/newview/skins/default/xui/pl/panel_flickr_photo.xml # indra/newview/skins/default/xui/pl/panel_progress.xml # indra/newview/skins/default/xui/pl/panel_settings_sky_atmos.xml # indra/newview/skins/default/xui/pl/panel_settings_sky_clouds.xml # indra/newview/skins/default/xui/pl/panel_settings_sky_sunmoon.xml # indra/newview/skins/default/xui/ru/floater_flickr.xml # indra/newview/skins/default/xui/ru/panel_flickr_account.xml # indra/newview/skins/default/xui/ru/panel_flickr_photo.xml	2023-01-13 15:19:29 +01:00
Andrey Kleshchev	5d6371f568	SL-18937 Update contributions	2023-01-10 20:05:01 +02:00
Andrey Kleshchev	64a42aceba	SL-18904 Remove unused translation files	2023-01-04 23:52:41 +02:00
Andrey Kleshchev	5ea7cec092	SL-18893 Update list of contributors	2023-01-04 22:21:20 +02:00
Ansariel	68c04f41ad	Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm ... # Conflicts: # indra/newview/viewer_manifest.py	2022-12-19 22:59:03 +01:00
Andrey Kleshchev	0ffe9ff0ae	SL-15175 Updates for TP states while the viewer is minimized	2022-12-13 21:25:16 +02:00
Ansariel	15f55c0a88	Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm ... # Conflicts: # doc/contributions.txt # indra/newview/llappviewer.cpp	2022-12-13 18:03:50 +01:00
Mnikolenko Productengine	553a98723b	Merge branch 'main' into DRTVWR-539 ... # Conflicts: # doc/contributions.txt # indra/newview/llappviewer.cpp # indra/newview/skins/default/colors.xml	2022-12-13 08:05:03 +02:00
Ansariel	5f81627faf	Merge branch 'DRTVWR-570-maint-Q' of https://github.com/secondlife/viewer ... # Conflicts: # doc/contributions.txt # indra/newview/llfloateravatar.h	2022-12-12 22:11:54 +01:00
Ansariel	67081f9728	Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm ... # Conflicts: # doc/contributions.txt # indra/newview/llfloater360capture.cpp	2022-12-12 22:09:54 +01:00
Callum Prentice	f7838ca17c	Merge branch 'main' into DRTVWR-568	2022-12-12 11:13:10 -08:00
Andrey Lihatskiy	f836194516	Merge branch 'main' into DRTVWR-570-maint-Q ... # Conflicts: # doc/contributions.txt # indra/newview/app_settings/shaders/class1/deferred/materialF.glsl # indra/newview/llfloater360capture.cpp	2022-12-12 20:53:11 +02:00
Andrey Lihatskiy	b4dd4271a1	SL-16874 Added tool tips to buttons displayed by llDialog()	2022-12-12 20:22:50 +02:00
Ansariel	4e87c96292	Merge branch 'DRTVWR-539' of https://github.com/secondlife/viewer ... # Conflicts: # autobuild.xml # indra/newview/llfloater360capture.cpp # indra/newview/llperfstats.cpp # indra/newview/llperfstats.h # indra/newview/llvoavatar.cpp # indra/newview/pipeline.cpp	2022-11-23 10:08:56 +01:00
Ansariel	ddfd54650e	Merge branch 'master' of https://vcs.firestormviewer.org/viewer-merges/phoenix-firestorm-568	2022-11-23 10:02:57 +01:00
Mnikolenko Productengine	de0317cc3f	Merge branch 'DRTVWR-568' into DRTVWR-539	2022-11-22 23:12:05 +02:00
Ansariel	abbfb9b7d0	Merge branch 'DRTVWR-565-maint-P' of https://github.com/secondlife/viewer	2022-11-22 16:23:13 +01:00
Andrey Lihatskiy	24993a914f	SL-18637 Reverted material shader changes ... original fix by Beq Janus	2022-11-14 23:58:14 +02:00
Ansariel	cb10f3b149	Merge branch 'DRTVWR-570-maint-Q' of https://bitbucket.org/lindenlab/viewer ... # Conflicts: # doc/contributions.txt # indra/llcommon/threadsafeschedule.h # indra/llwindow/llwindowmacosx-objc.mm # indra/llwindow/llwindowmacosx.cpp # indra/newview/llappdelegate-objc.mm # indra/newview/llfilepicker_mac.mm # indra/newview/llsettingsvo.cpp # indra/newview/llvosky.cpp	2022-11-11 12:15:54 +01:00
Mnikolenko Productengine	72b1cfc76b	SL-18586 FIXED Crash when opening 360 snapshot	2022-11-09 14:42:27 +02:00
Andrey Lihatskiy	55c27641fe	Merge remote-tracking branch 'BeqJanus/ll-viewer-pull-requests/Beq-alpha-mask-on-emissive-fix' into DRTVWR-570-maint-Q	2022-11-09 00:45:01 +02:00
Andrey Lihatskiy	2904062948	Merge remote-tracking branch 'ZiRee/viewer/master' into DRTVWR-570-maint-Q	2022-11-09 00:41:58 +02:00
Beq	dedee8ba50	initial merge form DRTVWR-539 branch	2022-11-02 22:37:24 +00:00
Ansariel	da8f95ad22	Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm	2022-11-02 18:06:07 +01:00
Andrey Lihatskiy	67ce0e77d7	Merge remote-tracking branch 'RyeMutt/viewer/mac-fixes' into DRTVWR-570-maint-Q	2022-11-02 18:50:18 +02:00
Ansariel	7732257ea5	Merge branch 'DRTVWR-570-maint-Q' of https://bitbucket.org/lindenlab/viewer	2022-11-02 13:05:00 +01:00
Andrey Lihatskiy	39e08b34b1	Merge remote-tracking branch 'RyeMutt/viewer/llsd-usage-fixes' into DRTVWR-570-maint-Q	2022-11-01 23:11:57 +02:00
Ansariel	9ee1a75474	Merge branch 'DRTVWR-570-maint-Q' of https://bitbucket.org/lindenlab/viewer ... # Conflicts: # indra/llcharacter/llkeyframemotion.cpp # indra/llcommon/lluuid.cpp # indra/llcommon/lluuid.h # indra/llui/llscrolllistctrl.cpp # indra/llui/llscrolllistctrl.h # indra/newview/app_settings/settings.xml # indra/newview/llfloatersettingsdebug.cpp # indra/newview/llfloatersettingsdebug.h # indra/newview/skins/default/xui/en/floater_settings_debug.xml # indra/newview/skins/default/xui/en/panel_preferences_privacy.xml	2022-11-01 17:17:56 +01:00
Ansariel	1bdfb7df70	Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm	2022-11-01 15:16:40 +01:00
Andrey Lihatskiy	d4d5d4018d	Merge remote-tracking branch 'RyeMutt/viewer/datapacker-crashfixes/datapacker-crashfixes' into DRTVWR-570-maint-Q	2022-10-29 00:32:59 +03:00
Mnikolenko Productengine	0aabcf9a85	Merge branch 'master' into DRTVWR-539	2022-10-27 14:23:42 +03:00
Andrey Lihatskiy	b8f75bd161	Merge branch 'master' into DRTVWR-570-maint-Q	2022-10-26 23:58:06 +03:00
Callum Linden	aad3b32a92	Merge branch 'master' into DRTVWR-568	2022-10-26 12:07:12 -07:00
Ansariel	8b2b11d4a0	Merge branch 'master' of https://bitbucket.org/lindenlab/viewer	2022-10-26 20:42:44 +02:00
Ansariel	242c8cb5ed	Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm ... # Conflicts: # autobuild.xml # doc/contributions.txt # indra/llcommon/CMakeLists.txt # indra/llprimitive/llmodel.cpp # indra/llwindow/CMakeLists.txt # indra/llwindow/llwindowmacosx.cpp # indra/newview/llinventorymodel.cpp # indra/newview/lllegacyatmospherics.cpp # indra/newview/llmeshrepository.cpp # indra/newview/llviewertexturelist.cpp # indra/newview/llvopartgroup.cpp # indra/newview/llworld.cpp	2022-10-25 11:49:36 +02:00
Callum Linden	80585d56fd	Merge master into DRTVWR-568 (and fix conflicts)	2022-10-24 17:48:16 -07:00
Andrey Lihatskiy	439aa79414	SL-18432 Fix for alpha sorting	2022-10-24 22:14:20 +03:00
Mnikolenko Productengine	717b34f53f	Merge branch 'master' into DRTVWR-539 ... # Conflicts: # indra/newview/llfloaterpreference.cpp # indra/newview/llviewercontrol.cpp	2022-10-21 14:42:53 +03:00
Ansariel	8b0d341aca	Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm	2022-10-21 12:34:53 +02:00
Andrey Lihatskiy	e0ace0c722	Merge branch 'master' into DRTVWR-570-maint-Q ... # Conflicts: # indra/newview/llnetmap.cpp # indra/newview/llnetmap.h	2022-10-20 22:34:11 +03:00
Ansariel	a9c29b4b81	Merge branch 'DRTVWR-570-maint-Q' of https://bitbucket.org/lindenlab/viewer ... # Conflicts: # indra/llui/lllineeditor.cpp # indra/llui/llmenugl.cpp # indra/llui/llmenugl.h # indra/llui/lltexteditor.cpp # indra/newview/llfloaterbump.cpp # indra/newview/llfloaterbump.h # indra/newview/llinventorypanel.cpp # indra/newview/llnetmap.cpp	2022-10-20 10:51:25 +02:00
Andrey Lihatskiy	f0cd5407c4	SL-18412 Merge remote-tracking branch 'RyeMutt/viewer/menu-leaks' into DRTVWR-570-maint-Q	2022-10-19 23:53:53 +03:00
Ansariel	2b65ae8215	Merge branch 'DRTVWR-570-maint-Q' of https://bitbucket.org/lindenlab/viewer	2022-10-15 17:33:22 +02:00
Mnikolenko Productengine	dbbc710739	SL-18348 FIXED Include next/previous face doesn't work	2022-10-13 14:39:29 +03:00
Ansariel	2aceea66ff	Merge branch 'DRTVWR-570-maint-Q' of https://bitbucket.org/lindenlab/viewer ... # Conflicts: # indra/llcommon/llsdserialize.cpp # indra/llmath/llvolume.cpp # indra/llmath/llvolume.h # indra/newview/llfloateropenobject.cpp # indra/newview/llfloateropenobject.h # indra/newview/llmaterialmgr.cpp # indra/newview/llmeshrepository.cpp # indra/newview/llmeshrepository.h # indra/newview/skins/default/xui/en/floater_openobject.xml	2022-10-01 13:10:39 +02:00
Andrey Kleshchev	338aeef7e9	SL-14696 SL-13629 Re-add gradation fix after merging a contribution	2022-10-01 00:48:25 +03:00
Andrey Kleshchev	6614a6ee99	SL-18249 Optimizations to mesh and material loading	2022-09-28 18:42:10 +03:00
Mnikolenko Productengine	198420f9f6	SL-18248 Move frame breakdown stats to 'Scene loading statistics' floater	2022-09-28 14:16:16 +03:00
Ansariel	1fc3aaff9b	Merge branch 'DRTVWR-568_cmake' of https://bitbucket.org/lindenlab/viewer ... # Conflicts: # .gitignore # autobuild.xml # indra/CMakeLists.txt # indra/cmake/00-Common.cmake # indra/cmake/Boost.cmake # indra/cmake/BuildVersion.cmake # indra/cmake/CEFPlugin.cmake # indra/cmake/CMakeLists.txt # indra/cmake/CURL.cmake # indra/cmake/Copy3rdPartyLibs.cmake # indra/cmake/DBusGlib.cmake # indra/cmake/DragDrop.cmake # indra/cmake/FMODSTUDIO.cmake # indra/cmake/FindHUNSPELL.cmake # indra/cmake/FindJsonCpp.cmake # indra/cmake/FindOpenJPEG.cmake # indra/cmake/FindURIPARSER.cmake # indra/cmake/FreeType.cmake # indra/cmake/GLH.cmake # indra/cmake/Hunspell.cmake # indra/cmake/JsonCpp.cmake # indra/cmake/LLKDU.cmake # indra/cmake/LLPhysicsExtensions.cmake # indra/cmake/LLPlugin.cmake # indra/cmake/LLWindow.cmake # indra/cmake/Linking.cmake # indra/cmake/MESHOPTIMIZER.cmake # indra/cmake/MediaPluginBase.cmake # indra/cmake/NGHTTP2.cmake # indra/cmake/OPENAL.cmake # indra/cmake/OpenGL.cmake # indra/cmake/OpenJPEG.cmake # indra/cmake/OpenSSL.cmake # indra/cmake/PNG.cmake # indra/cmake/Tracy.cmake # indra/cmake/UI.cmake # indra/cmake/Variables.cmake # indra/cmake/ViewerMiscLibs.cmake # indra/cmake/ZLIBNG.cmake # indra/cmake/bugsplat.cmake # indra/integration_tests/llui_libtest/CMakeLists.txt # indra/linux_crash_logger/CMakeLists.txt # indra/llaudio/CMakeLists.txt # indra/llcommon/CMakeLists.txt # indra/llcommon/llapp.cpp # indra/llcorehttp/CMakeLists.txt # indra/llimagej2coj/CMakeLists.txt # indra/llinventory/CMakeLists.txt # indra/llmath/CMakeLists.txt # indra/llmath/llcalcparser.h # indra/llmessage/CMakeLists.txt # indra/llprimitive/CMakeLists.txt # indra/llrender/CMakeLists.txt # indra/llrender/llglslshader.cpp # indra/llwindow/CMakeLists.txt # indra/media_plugins/CMakeLists.txt # indra/media_plugins/base/CMakeLists.txt # indra/newview/CMakeLists.txt # indra/newview/llappviewerwin32.cpp # indra/newview/llxmlrpclistener.cpp # indra/newview/llxmlrpctransaction.cpp # indra/newview/viewer_manifest.py # indra/test/CMakeLists.txt	2022-09-17 23:12:34 +02:00
Andrey Kleshchev	9bad5d08fb	SL-17238 Large cmake contribution by NickyD	2022-09-17 19:30:31 +03:00
Andrey Kleshchev	248bf15ce8	SL-17238 Large cmake contribution by NickyD	2022-09-17 14:03:55 +03:00
Ansariel	55f51f4829	Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm	2022-08-31 17:02:33 +02:00
Andrey Lihatskiy	a9a63db0f0	Merge branch 'master' into DRTVWR-548-maint-N	2022-08-31 00:17:37 +03:00
Ansariel	2c0edbac18	Merge branch 'master' of https://vcs.firestormviewer.org/viewer-merges/phoenix-firestorm-ll-master	2022-06-29 22:04:20 +02:00
Andrey Lihatskiy	2e837e5389	Merge branch 'master' into DRTVWR-548-maint-N ... # Conflicts: # doc/contributions.txt # indra/newview/llviewercontrol.cpp	2022-06-29 20:51:08 +03:00
Ansariel	1fbfe48f84	Merge branch 'master' of https://vcs.firestormviewer.org/viewer-merges/phoenix-firestorm-ll-master	2022-06-29 18:23:17 +02:00
Andrey Kleshchev	1b369c7f10	Merge branch 'master' (DRTVWR-543) into DRTVWR-483 ... # Conflicts: # indra/newview/llviewertexturelist.cpp	2022-06-29 18:30:05 +03:00
Ansariel	cfb6c083fe	Merge branch 'DRTVWR-548-maint-N' of https://bitbucket.org/lindenlab/viewer ... # Conflicts: # indra/llcommon/CMakeLists.txt # indra/llfilesystem/lldiskcache.cpp # indra/llwindow/CMakeLists.txt # indra/newview/app_settings/settings.xml # indra/newview/llappviewer.cpp	2022-06-24 22:18:44 +02:00
Ansariel	6259666be0	Merge branch 'DRTVWR-548-maint-N' of https://bitbucket.org/lindenlab/viewer ... # Conflicts: # indra/llmath/lloctree.h # indra/llmath/llvolume.cpp # indra/llrender/llgl.cpp # indra/newview/installers/windows/installer_template.nsi # indra/newview/installers/windows/lang_da.nsi # indra/newview/installers/windows/lang_de.nsi # indra/newview/installers/windows/lang_en-us.nsi # indra/newview/installers/windows/lang_es.nsi # indra/newview/installers/windows/lang_fr.nsi # indra/newview/installers/windows/lang_it.nsi # indra/newview/installers/windows/lang_ja.nsi # indra/newview/installers/windows/lang_pl.nsi # indra/newview/installers/windows/lang_pt-br.nsi # indra/newview/installers/windows/lang_ru.nsi # indra/newview/installers/windows/lang_tr.nsi # indra/newview/installers/windows/lang_zh.nsi # indra/newview/lldynamictexture.cpp # indra/newview/llfloaterpreference.cpp # indra/newview/llviewercontrol.cpp # indra/newview/llviewermenu.cpp # indra/newview/llvovolume.cpp	2022-06-22 21:11:47 +02:00
Maxim Nikolenko	1167ea994c	SL-17634 Replace deprecated carbon Gestalt calls	2022-06-22 18:00:49 +03:00
Andrey Kleshchev	791b7ff0e9	SL-17585 Don't bother users with dialogs if we are already quiting	2022-06-20 17:07:49 +03:00
Ansariel	6ccdf5545d	Merge branch 'master' of https://vcs.firestormviewer.org/viewer-merges/phoenix-firestorm-546 ... # Conflicts: # autobuild.xml # indra/llcommon/CMakeLists.txt # indra/llrender/llgl.cpp # indra/newview/llappviewer.cpp # indra/newview/llface.cpp # indra/newview/llflexibleobject.cpp # indra/newview/llvovolume.cpp	2022-05-27 11:41:45 +02:00
Andrey Lihatskiy	3da7a50b71	Merge branch 'master' into DRTVWR-543-maint ... # Conflicts: # autobuild.xml # indra/cmake/LLCommon.cmake # indra/llcommon/CMakeLists.txt # indra/llrender/llgl.cpp # indra/newview/llappviewer.cpp # indra/newview/llface.cpp # indra/newview/llflexibleobject.cpp # indra/newview/llvovolume.cpp	2022-05-27 02:51:33 +03:00
Ansariel	b61dfd131d	Merge branch 'master' of https://vcs.firestormviewer.org/viewer-merges/phoenix-firestorm-546	2022-05-26 11:36:16 +02:00
Andrey Lihatskiy	2ed401882e	Merge branch 'master' into DRTVWR-483 ... # Conflicts: # indra/newview/llviewertexturelist.cpp	2022-05-26 02:56:29 +03:00
Ansariel	c1a4be7dae	Merge branch 'DRTVWR-543-maint' of https://bitbucket.org/lindenlab/viewer ... # Conflicts: # autobuild.xml # indra/cmake/Boost.cmake # indra/llappearance/lltexlayer.cpp # indra/llinventory/llparcel.cpp # indra/newview/app_settings/settings.xml # indra/newview/llappviewer.cpp # indra/newview/llface.cpp # indra/newview/llviewertexturelist.cpp # indra/newview/llvovolume.cpp	2022-04-19 13:21:52 +02:00
Nat Goodspeed	4e282db26b	SL-17218: Credit NickyD's contributions to this Jira.	2022-04-14 15:32:19 -04:00
Andrey Kleshchev	51e318fd8d	SL-14541 Pull in updated zlib-ng ... Nicky Dasmijn's contribution for zlib-ng Linux builds	2022-03-05 11:34:13 +02:00
Ansariel	455b750cde	Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm ... # Conflicts: # indra/newview/llviewermenu.cpp	2022-03-02 12:04:09 +01:00
Ansariel	ef88337eef	Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm ... # Conflicts: # autobuild.xml # doc/contributions.txt # indra/llcommon/tests/llprocess_test.cpp # indra/newview/lldrawpoolavatar.cpp # indra/newview/llfloatermodelpreview.cpp # indra/newview/llmodelpreview.cpp # indra/newview/llviewertexturelist.cpp # indra/newview/llvovolume.cpp # indra/newview/viewer_manifest.py	2022-03-02 10:12:19 +01:00
Andrey Kleshchev	97a103255e	Merge branch 'master' (DRTVWR-557) into DRTVWR-546 ... # Conflicts: # autobuild.xml # doc/contributions.txt # indra/cmake/GLOD.cmake # indra/llcommon/tests/llprocess_test.cpp # indra/newview/VIEWER_VERSION.txt # indra/newview/lldrawpoolavatar.cpp # indra/newview/llfloatermodelpreview.cpp # indra/newview/llmodelpreview.cpp # indra/newview/llviewertexturelist.cpp # indra/newview/llvovolume.cpp # indra/newview/viewer_manifest.py	2022-03-01 13:41:42 +02:00
Andrey Lihatskiy	e70fe3a50d	Merge branch 'master' into DRTVWR-483 ... # Conflicts: # indra/newview/llviewermenu.cpp	2022-02-28 22:01:18 +02:00
Ansariel	828fbdc571	Merge branch 'DRTVWR-553-maint-mix-JK' of https://bitbucket.org/lindenlab/viewer	2022-02-02 10:37:33 +01:00
Andrey Lihatskiy	0bef5e553e	Revert "SL-14717 Ability to trigger left clicks (and more) on animesh objects" ... This reverts commit 8215fff0c2. # Conflicts: # indra/newview/lltoolpie.cpp	2022-01-21 19:13:28 +02:00
Ansariel	95db09d8d0	Merge branch 'master' of https://vcs.firestormviewer.org/viewer-merges/phoenix-firestorm-530 ... # Conflicts: # indra/newview/llappviewer.cpp # indra/newview/llkeyconflict.cpp	2022-01-10 23:31:49 +01:00
Andrey Lihatskiy	469ce7f7f6	Merge branch 'DRTVWR-530-maint' into DRTVWR-553-maint-mix-JK ... # Conflicts: # indra/newview/app_settings/key_bindings.xml # indra/newview/llappviewer.cpp # indra/newview/llkeyconflict.cpp	2022-01-10 23:51:52 +02:00
Andrey Lihatskiy	b33e18585d	Merge branch 'master' into DRTVWR-483	2021-12-26 14:00:00 +02:00
Ansariel	f19311bf7a	Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm	2021-12-20 12:45:10 +01:00
Ansariel	496156073b	Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm	2021-12-16 18:56:31 +01:00
Ansariel	2ba4a164e2	Merge branch 'DRTVWR-527-maint' of https://bitbucket.org/lindenlab/viewer ... # Conflicts: # autobuild.xml # indra/cmake/Python.cmake # indra/lib/python/indra/util/llmanifest.py # indra/lib/python/indra/util/test_win32_manifest.py # indra/llaudio/llstreamingaudio_fmodstudio.cpp # indra/llaudio/llstreamingaudio_fmodstudio.h # indra/llcommon/llerror.cpp # indra/newview/llappviewer.cpp # indra/newview/lleventnotifier.cpp # indra/newview/llpanellandmarks.cpp # indra/newview/llpreviewanim.cpp # indra/newview/llpreviewanim.h # indra/newview/llviewerregion.cpp # indra/newview/skins/default/xui/de/menu_place_add_button.xml # indra/newview/skins/default/xui/it/menu_place_add_button.xml # indra/newview/skins/default/xui/it/menu_teleport_history_item.xml # indra/newview/skins/default/xui/ja/menu_place_add_button.xml # indra/newview/skins/default/xui/pl/menu_place_add_button.xml # indra/newview/skins/default/xui/pl/menu_teleport_history_item.xml # indra/newview/skins/default/xui/ru/menu_place_add_button.xml # indra/newview/skins/default/xui/ru/menu_teleport_history_item.xml # indra/newview/viewer_manifest.py	2021-12-16 12:32:34 +01:00
Ansariel	39f272278c	Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm ... # Conflicts: # indra/media_plugins/cef/media_plugin_cef.cpp	2021-12-16 10:20:56 +01:00