livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
70,029 Commits
2 Branches
0 Tags
297 MiB
Commit Graph

1022 Commits (f3fa991d2ccfb5ff969edbd77b9c6b2d5010fb45)

Author SHA1 Message Date
Ansariel a520340900 Merge branch 'DRTVWR-567' of https://github.com/secondlife/viewer 
# Conflicts:
#	indra/newview/app_settings/settings.xml
#	indra/newview/llsidepanelinventory.cpp
#	indra/newview/lltexturectrl.cpp
#	indra/newview/skins/default/xui/en/floater_texture_ctrl.xml
#	indra/newview/skins/default/xui/en/panel_outfit_gallery.xml
 2023-07-04 14:42:05 +02:00
Andrey Kleshchev d3233e787a SL-19929 New inventory feature notification should appear on top 2023-07-03 23:29:26 +03:00
Andrey Kleshchev f149b87fcc SL-19929 New inventory feature notification 2023-06-29 23:54:27 +03:00
Ansariel 24db83c554 Merge branch 'DRTVWR-539' of https://github.com/secondlife/viewer 
# Conflicts:
#	indra/cmake/Copy3rdPartyLibs.cmake
#	indra/cmake/OpenJPEG.cmake
#	indra/integration_tests/llui_libtest/CMakeLists.txt
#	indra/newview/CMakeLists.txt
#	indra/newview/app_settings/settings.xml
#	indra/newview/featuretable_mac.txt
#	indra/newview/llfloaterpreference.cpp
#	indra/newview/llperfstats.cpp
#	indra/newview/llperfstats.h
#	indra/newview/llstartup.cpp
#	indra/newview/llvoavatar.cpp
#	indra/newview/pipeline.cpp
#	indra/newview/skins/default/xui/en/floater_performance.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_presets_pulldown.xml
 2023-02-03 17:15:04 +01:00
Maxim Nikolenko 6cbe17305c SL-18991 FIXED Autotune starts too early after login-in 2023-01-19 15:55:44 +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
Beq dedee8ba50 initial merge form DRTVWR-539 branch 2022-11-02 22:37:24 +00:00
Ansariel 1ca8584322 Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2022-10-22 15:48:47 +02:00
Ansariel 66bde72599 Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2022-10-21 13:51:00 +02: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 401fa5a4e4 Merge branch 'master' of https://bitbucket.org/lindenlab/viewer 2022-10-21 01:51:04 +02:00
Andrey Lihatskiy 97b676b60f Merge branch 'master' into DRTVWR-565-maint-P 2022-10-20 21:43:54 +03:00
Mnikolenko Productengine 3098d315a3 SL-18202 remove old autofps 2022-09-23 16:49:47 +03:00
Andrey Lihatskiy 26c8883bb7 Merge remote-tracking branch 'origin/SL-18119' into DRTVWR-548-maint-N 2022-09-22 19:13:13 +03:00
Brad Payne (Vir Linden) 3994101549 SL-18119 - more ViewerStats logs for NUX 2022-09-21 20:52:27 +01:00
Ansariel cf434f6f06 Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2022-09-21 19:13:26 +02:00
Mnikolenko Productengine 85504f085e Merge branch 'master' into DRTVWR-539 2022-09-21 18:36:49 +03:00
Andrey Lihatskiy b5861e58cb Merge branch 'master' into DRTVWR-565-maint-P 2022-09-15 20:43:02 +03:00
Ansariel 7d0d744e34 Merge branch 'DRTVWR-565-maint-P' of https://bitbucket.org/lindenlab/viewer 
# Conflicts:
#	indra/newview/featuretable_linux.txt
#	indra/newview/llagent.cpp
#	indra/newview/llfloatertranslationsettings.cpp
#	indra/newview/llviewercontrol.cpp
#	indra/newview/llviewerfloaterreg.cpp
#	indra/newview/llviewerregion.cpp
#	indra/newview/llviewerwindow.cpp
#	indra/newview/skins/default/xui/en/notifications.xml
 2022-09-13 19:37:45 +02:00
Andrey Kleshchev 0fa8fbc4a7 SL-16156 Fix exit crash in 360 snapshot floater 2022-09-08 22:58:55 +03:00
Andrey Kleshchev 12c7f42004 SL-17908 No left and right events when both held down 
Reverts part of SL-15746
 2022-08-06 12:02:22 +02:00
Andrey Kleshchev bc26931482 SL-17908 No left and right events when both held down 
Reverts part of SL-15746
 2022-08-05 19:44:54 +03:00
Ansariel 8ba71585ba Merge branch 'master' of https://vcs.firestormviewer.org/viewer-merges/phoenix-firestorm-ll-master 2022-06-30 18:57:37 +02:00
Mnikolenko Productengine b0e9840648 Merge branch 'master' into DRTVWR-539 2022-06-29 21:03:15 +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
Mnikolenko Productengine 79c9a8a4b7 Merge branch 'DRTVWR-546' into DRTVWR-539 2022-04-26 16:03:03 +03:00
Ansariel d77e0c4e99 Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 
# Conflicts:
#	indra/llcommon/llsdutil.cpp
#	indra/newview/lldrawpoolalpha.cpp
#	indra/newview/lldrawpoolavatar.cpp
#	indra/newview/lldrawpoolwater.cpp
#	indra/newview/llmodelpreview.cpp
 2022-04-20 16:02:17 +02:00
Ansariel b8b0c8ec3b Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2022-04-19 15:42:14 +02:00
Ansariel 1aaa765d26 Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2022-04-19 12:33:48 +02:00
Andrey Kleshchev ce4c694b66 Merge branch master (D540) into DRTVWR-546 
# Conflicts:
#	indra/llcommon/llsdutil.cpp
#	indra/newview/VIEWER_VERSION.txt
#	indra/newview/lldrawpoolalpha.cpp
#	indra/newview/lldrawpoolwater.cpp
 2022-04-18 23:42:39 +03:00
Andrey Lihatskiy dbb044e9bb Merge branch 'master' into DRTVWR-543-maint 2022-04-18 20:38:06 +03:00
Ansariel bebd6c5e13 Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 
# Conflicts:
#	autobuild.xml
#	doc/contributions.txt
#	indra/llcommon/tests/llprocess_test.cpp
#	indra/newview/llappviewer.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:32 +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
Mnikolenko Productengine 0aaf5284dc Merge branch 'master' into DRTVWR-539 
# 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-02 00:46:10 +02:00
Ansariel e10dea5fe2 Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2022-03-01 18:09:12 +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 201f83472c Merge branch 'master' into DRTVWR-543-maint 2022-02-28 21:55:28 +02:00
Ansariel 7b32862d42 Merge branch 'DRTVWR-539' of https://bitbucket.org/lindenlab/viewer 2022-01-25 19:26:26 +01:00
Mnikolenko Productengine d7603ffc9c SL-16627 AutoFPS first pass 2022-01-24 16:33:44 +02:00
Ansariel a0837a5298 Merge branch 'DRTVWR-543-maint' of https://bitbucket.org/lindenlab/viewer 2022-01-14 13:46:29 +01:00
Andrey Lihatskiy 970b6661cd Merge branch 'master' into DRTVWR-543-maint 2021-12-26 14:01:17 +02:00
Andrey Lihatskiy 747dbb7da2 Merge branch 'master' into DRTVWR-540-maint 2021-12-26 14:01:06 +02:00
Ansariel a0e777b17e Merge branch 'DRTVWR-540-maint' of https://bitbucket.org/lindenlab/viewer 2021-12-17 09:57:48 +01:00
Ansariel d392b46984 Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2021-12-17 09:21:55 +01:00
Ansariel 496156073b Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2021-12-16 18:56:31 +01:00
Ansariel 6663bc6f85 Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 
# Conflicts:
#	autobuild.xml
#	indra/llfilesystem/llfilesystem.cpp
#	indra/newview/CMakeLists.txt
#	indra/newview/llappviewer.cpp
#	indra/newview/lldrawpoolavatar.cpp
#	indra/newview/llviewercontrol.cpp
 2021-12-16 09:49:35 +01:00
Dave Houlton cf35d27dfb DRTVWR-546 merge up to 6.5.2 2021-12-15 14:37:18 -07:00
Ansariel a3c1080295 Merge branch 'DRTVWR-552-cache-360' of https://bitbucket.org/lindenlab/viewer 2021-12-15 21:05:24 +01:00