1681 Commits (fc438607d2f33c8a930ab9dd532cdf210b9c7ea7)

Author	SHA1	Message	Date
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 Kleshchev	250228af25	SL-19660 Updated contributions doc	2023-05-09 17:58:13 +03:00
Ansariel	2a6c81f1d6	Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm	2023-05-02 17:52:00 +02:00
Andrey Lihatskiy	ff8dcc23bf	Merge branch 'main' into DRTVWR-577-maint-S	2023-05-02 17:39:37 +03: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
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
Andrey Lihatskiy	d080ec2808	SL-4126 Updated contributions.txt	2023-03-22 19:09:26 +02: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
Mnikolenko Productengine	7298a049a7	SL-19317 fix for avatar attachment accounting	2023-03-02 18:00:11 +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
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
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
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
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
Ansariel	57e8cd490f	Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm	2022-11-23 10:00:44 +01:00
Ansariel	1bb61071a1	Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm	2022-11-23 09:58:43 +01:00
Mnikolenko Productengine	de0317cc3f	Merge branch 'DRTVWR-568' into DRTVWR-539	2022-11-22 23:12:05 +02:00
Mnikolenko Productengine	daa1257466	Merge branch 'master' into DRTVWR-539	2022-11-22 17:38:01 +02:00
Ansariel	8f45ad9323	Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm	2022-11-22 16:29:17 +01: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	25c62f554f	Merge branch 'master' into DRTVWR-570-maint-Q	2022-11-21 22:46:35 +02:00
Ansariel	dbc70be7c4	Merge branch 'master' of https://github.com/secondlife/viewer ... # Conflicts: # README.md # autobuild.xml	2022-11-21 20:37:32 +01:00
Andrey Kleshchev	96f0c95898	Merge branch master into DRTVWR-565-maint-P	2022-11-21 20:48:24 +02:00
Kyler Eastridge	35d2771cd3	Fix spelling error on license file name	2022-11-18 06:23:11 -05:00
Kyler Eastridge	4a33a0edb2	Fix readme logo for dark theme sites	2022-11-18 06:22:43 -05: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